From 26bdd44576f25d63bf32632369b0cbdd94c93d7a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 16 Aug 2019 17:08:17 -0400 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-openembedded: 64974b8779..c95842cdca: Adrian Bunk (46): modemmanager: Remove the obsolete dependency on dbus-glib gpsd: Remove the obsolete dependency on dbus-glib eggdbus: Remove this obsolete package sanity-meta-gnome: Remove obsolete class gssdp: Merge inc vlc: notify switched to GTK+3 some time ago tremor: Upgrade 20150107 -> 20180319 vlc: Remove the obsolete dependency on dbus-glib blueman: Enable thunar support by default but don't rdepend on it gnome-bluetooth: Drop bluez4 support networkmanager: Drop bluez4 support packagegroup-meta-networking-connectivity: Correct a DISTRO_FEATURES check packagegroup-tools-bluetooth: Remove bluez4 support cpprest: Fix build failure with gcc 8 packagegroup-basic: Remove bluez4 support packagegroup-meta-oe: Remove bogus bluez4 DISTRO_FEATURES checks esound: Remove this obsolete package gpsd: Remove obsolete musl patch gpsd: Don't build without optimization zeromq: Upgrade 4.3.1 -> 4.3.2 obex-data-server: Drop bluez4 support openobex: Drop bluez4 support gpsd: Drop bluez4 support libao: Remove the non-default esound PACKAGECONFIG gpsd: Disable manpage building by config option instead of patching gpsd: Upgrade 3.18.1 -> 3.19 gnome-desktop3: Fix REQUIRED_DISTRO_FEATURES meta-gnome: Remove GNOME_COMPRESS_TYPE = "xz" in recipes jasper: Use the new upstream GitHub location instead of the defunct tarball URL fluidsynth: Add PACKAGECONFIG for readline meta-multimedia: Remove GNOME_COMPRESS_TYPE = "xz" in recipes udisks: Remove this obsolete version gpsd: Switch from python-scons-native to python3-scons-native meta-gnome: Inherit gnomebase instead of gnome meta-oe: Inherit gnomebase instead of gnome libgsf: Drop the obsolete inherit gconf gnome-system-monitor: Add DEPENDS on polkit meta-oe: Change some ftp:// URIs to http(s):// meta-oe: Use GNU_MIRROR in more recipes wireshark: Use an upstream URL that stays valid longer modemmanager: Use a simpler workaround for the clang build network-manager-applet: Remove obsolete do_configure_append network-manager-applet: Remove the obsolete DEPENDS on gconf wv: Remove, abiword was the only user gtkmathview: Remove, abiword was the last user t1lib: Remove, gtkmathview was the last user Alex Kiernan (6): keyutils: Fix build with usrmerge iwd: update to 0.18 libzip: Upgrade 1.5.1 -> 1.5.2 zstd: New recipe zstd: Update 1.4.0 -> 1.4.2 iwd: Upgrade 0.18 -> 0.19 Alexander Kanavin (3): python-matplotlib: remove the python 2.x version of the recipe python-oauthlib: remove the 2.x version of the recipe python-pandas: remove the python 2.x version of the recipe Alistair Francis (3): gpsd: Upgrade from 3.17 to 3.18.1 gpsd: Fix the systemd service run paths python: pypi: Add python3-term Anatol Belski (1): gperftools: separate off libtcmalloc-minimal Andreas Müller (2): meta-xfce: Make Kai Kang layer maintainer abiword: remove Andrej Valek (2): nodejs: 10.15.3 -> 10.16.0 nodejs: 10.16.0 -> 10.16.2 André Draszik (1): layer.conf: ignore wireless-regdb->crda dep for siggen purposes Ankit Navik (1): safec: Remove aarch64 from COMPATIBLE_HOST Anuj Mittal (2): xterm: upgrade 330 -> 347 libsdl: import from OE-Core Armin Kuster (5): keyutils: update to 1.6 keyutils: improve ptests keyutils: fix QA WARNING keyutils: fix pulling in glibc when musl enabled keyutils: fix library install path Arturo Buzarra (1): lvm2: Fix RDEPEND on lvm2 to lvm2-udevrules Ayoub Zaki (1): pegtl: Initial recipe Bartosz Golaszewski (2): bats: new package libgpiod: bump version to v1.4.1 Beniamin Sandu (1): unbound: create recipe for version 1.9.2 Callaghan, Dan (1): unixodbc: mysql5 is not required but readline is Changqing Li (15): python-pygobject: fix install dir for python2 dlm: upgrade 4.0.7 -> 4.0.9 uthash: remove uthash-ptest dependencies waf-samba: switch to python3 libtevent: upgrade 0.9.37 -> 0.10.0 libtdb: upgrade 1.3.17 -> 1.4.0 libtalloc: upgrade 2.1.14 -> 2.2.0 samba: upgrade 4.8.12 -> 4.10.5 libldb: upgrade 1.4.1 -> 1.5.4 volume-key: fix "Nothing RPROVIDES" when multilib enabled isomd5sum: fix "Nothing RPROVIDES" when multilib enabled satyr: fix "Nothing RPROVIDES" when multilib enabled libtevent: fix do_package_qa issue libtdb: fix do_package_qa issue fio: Delete redundant tag Chin Huat Ang (1): opencv: 3.4.5 -> 4.1.0 Denys Dmytriyenko (1): ufs-tool: add tool to access UFS (Universal Flash Storage) devices Douglas Royds (2): grpc: DEPENDS on googletest packagegroup-meta-oe: RDEPENDS on googletest Drew Moseley (1): networkmanager: Use ALTERNATIVES for resolv-conf handling. Erik Botö (1): paho-mqtt-c: enable SSL Fabian Klemp (1): openvpn: respect pid file in init.d service start Gianfranco Costamagna (3): iniparser: add initial recipe cpprest: update to 2.10.14 cpprest: Do not export Werror from build system instead of adding -Wno-error to the same build command He Zhe (1): drbd-utils: Fix netlink failure with nested attributes for kernel v5.2 Hongxu Jia (24): packagegroup-xfce-extended: conditional runtime recommends on xfce-polkit xfce-polkit: add required distro feature check to polkit xfce4-session: optional support polkit upower: remove polkit dependency gvfs: add meson option admin and udisks2 to PACKAGECONFIG mongodb: add to PNBLACKLIST itstool: use libxml2 to instead of python3-lxml meta-multimedia: add layer depends on meta-python itstool: use libxml2 to instead of python3-lxml python-six: remove duplicated recipe libauthen-radius-perl: ptest requires meta-networking to be present xfce4-panel: use lxdm to replace dm-tool drop lxdm_%.bbappend python3-pykickstart: 3.18 -> 3.20 python3-blivet: 3.1.2 -> 3.1.4 python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2 libbytesize: 1.4 -> 2.0 libblockdev: 2.20 -> 2.22 network-manager-applet: 1.8.20 -> 1.8.22 thin-provisioning-tools: 0.7.6 -> 0.8.5 libreport: 2.9.7 -> 2.10.0 python3-blivetgui: fix blivet-gui broken php: remove 5.6.40 lmsensors: support package lmsensors Jackie Huang (1): keyutils: add new recipe Jason Wessel (1): libbytesize: Add depends for gettext-native Joshua Lock (3): python-cffi: add missing RDEPENDS on pycparser python-attrs: add native BBCLASSEXTEND python-dateutil: add native BBCLASSEXTEND Kai Kang (39): mozjs: fix configure failure on CentOS 7.6 libvncserver: update to latest commit 1354f7f libxfce4util: 4.13.3 -> 4.13.4 libxfce4ui: 4.13.5 -> 4.13.6 exo: 0.12.5 -> 0.12.6 xfconf: 4.13.7 -> 4.13.8 thunar: 1.8.6 -> 1.8.7 xfce4-session: 4.13.2 -> 4.13.3 xfwm4: 4.13.2 -> 4.13.3 xfdesktop: 4.13.4 -> 4.13.5 xfce4-power-manager: 1.6.2 -> 1.6.3 xfce4-panel: 4.13.5 -> 4.13.6 xfce4-dev-tools: 4.12.0 -> 4.13.0 thunar-volman: 0.9.2 -> 0.9.3 garcon: 0.6.2 -> 0.6.3 xfce4-settings: 4.12.4 -> 4.13.7 xfce4-pulseaudio-plugin: add dependency dbus-glib xfce4-verve-plugin: 1.1.0 -> 2.0.0 net-snmp: update SRC_URI xfwm4: fix assertion error poppler: toggle gobject-introspection support xfce4-settings: rrecommends xfce4-datetime-setter xfce4-datetime-setter: add recipe libxfce4util: 4.13.4 -> 4.14.0 xfconf: 4.13.8 -> 4.14.1 libxfce4ui: 4.13.6 -> 4.14.1 exo: 0.12.6 -> 0.12.8 garcon: 0.6.3 -> 0.6.4 thunar: 1.8.7 -> 1.8.9 thunar-volman: 0.9.3 -> 0.9.5 tumbler: 0.2.0 -> 0.2.7 xfce4-appfinder: 4.13.3 -> 4.14.0 xfce4-dev-tools: 4.13.0 -> 4.14.0 xfce4-panel: 4.13.6 -> 4.14.0 xfce4-power-manager: 1.6.3 -> 1.6.5 xfce4-session: 4.13.3 -> 4.14.0 xfce4-settings: 4.13.7 -> 4.14.0 xfdesktop: 4.13.5 -> 4.14.1 xfwm4: 4.13.3 -> 4.14.0 Khem Raj (44): wvdial: Fix build with musl librelp: Pass Wno-error to compiler recipes: Use BPN instead of PN in SRC_URIs cli11: Refresh patch to fix fuzz sthttpd: Use git SRC_URI instead of github archive arno-iptables-firewall: Switch to git fetcher firewalld: Update to 0.6.3->0.6.4 python-matplotlib: Use git src_uri mpv: Switch to using git fetcher x11vnc: Switch to git fetcher dumb-init: Switch to git fetcher pam-plugin-ldapdb: Use git fetcher libuv: Switch to using git fetcher usbctl: Switch to git fetcher pmdk: Fix libdir which is multi-lib aware kexec-tools-klibc: Refresh patch with no code change log4cplus: Fix build with gold linker orage: Fix build with libical3 pegtl: Fix build with clang/libc++ postfix: Fix build failures with glibc 2.30 snort: Fix build with glibc 2.30 opensaf: Add configure time check to detect gettid API in libc ypbind-mt: Fix build with glibc 2.30 openocd: Fix build with glibc 2.30 netkit-rusers: Add dep on rpcsvc-proto for rpc headers collectd: Fix build with glibc 2.30 alsa-oss: Drop now not needed patch klcc-cross: Recognise --unwindlib clang option libsub-exporter-progressive-perl: Remove unneeded DEPENDS_PN libedit: Delete sjf2410-linux-native: Do not include sys/io.h gradm: Upgrade to 3.1-201903191516 release pmdk: Fix packaging errors when building on non-x86 host klibc: Pass -fno-builtin-bcmp with musl/clang combo graphviz: Fix build error that surfaced with latest pango graphviz: Do not build tcl support for target python-grpcio: Use gettid API from glibc 2.30+ grpc: Update to 1.22.0 android-tools: Fix build with glibc 2.30 iperf2: Upgrade to 2.0.13 netkit-rusers: Depend on rpcsvc-proto-native for rpcgen tool kpatch: Pass ARCH from environment python3-pillow: Provide python3-imaging netkit-rusers: Fix cross-build after glibc dropped rpc Laszlo Toth (1): networkmanager: fix typo in nonarch_base_libdir Liwei Song (2): pm-graph: fix time format parse error fio: fix first direct IO errored when ioengine is splice Luca Boccassi (2): python-pygobject: move python-setuptools from RDEPENDS to DEPENDS python-pygobject: remove build-dependency on setuptools and add dependency on pkgutil Luca Ceresoli (4): fuse-exfat: moved to github exfat-utils: moved to github fuse-exfat: update 1.2.3 -> 1.3.0 exfat-utils: update 1.2.3 -> 1.3.0 Luca Palano (1): Netdata upgrade: 1.8.0 -> 1.16.0 Maciej Pijanowski (8): python3-websockets: upgrade to 8.0.2 python3-multidict: upgrade to 4.5.2 python-engineio: upgrade to 3.9.3 python-socketio: upgrade to 4.3.1 python-aiohttp.inc: add missing RDEPENDS python-async-timeout: add asyncio to RDEPENDS python-socketio.inc: add missing RDEPENDS python3-aiofiles: add recipe Mariano Lopez (1): nftables: 0.9.0 > 0.9.1 Martin Jansa (8): protobuf: fix build with gold SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS add lsb and util-linux for phoronix-test-suite oprofile: drop kernel-vmlinux from RRECOMMENDS libdbi-perl: prevent native libdbi-perl depending on target perl redis: backport a fix for stack trace generation on aarch64 ntop: fix missing return from non-void function python3-twofish: Fix missing return statements in module stubs kernel-selftest: skip -Werror=format-security and fortify Max Krummenacher (1): joe: update to 4.6 Mikko Rapeli (2): protobuf: fix ptest compilation with hardening flags stress-ng: delete recipe Mingli Yu (7): fio: Upgrade to 3.15 crash: Upgrade to 7.2.6 makedumpfile: Upgrade to 1.6.6 hwloc: Upgrade to 1.11.13 iperf3: Upgrade to 3.7 log4cplus: Upgrade to 2.0.4 log4cplus: remove gold linker setting Oleksandr Kravchuk (22): nghttp2: update to 1.39.1 drbd-utils: update to 9.10.0 drbd: update to 9.0.18-1 keepalived: update to 2.0.16 nano: update to 4.3 nuttcp: add systemd unit file mbedtls: update to 2.16.2 dhcpcd: update to 7.2.2 freediameter: update to 1.2.1 sethdlc: set PV in filename miniupnpd: update to 2.1.20190210 ipvsadm: update to 1.30 uftp: update to 4.9.11 libnftnl: update to 1.1.3 dhcpcd: update to 7.2.3 blueman: update to 2.1.1 uftp: update to 4.10 htpdate: update to 1.2.1 dhcpcd: update to 8.0.1 chrony: update to 3.5 wolfssl: update to 4.1.0 dhcpcd: update to 8.0.2 Ovidiu Panait (2): python3-pillow: 5.4.1 -> 6.1 python3-pillow: Add python3-misc/logging/numbers to RDEPENDS Paolo Valente (1): s-suite: push SRCREV to version 3.5 Parthiban Nallathambi (1): python3-matplotlib: add version 3.1.1 Pascal Bach (1): protobuf: 1.3.1 -> 1.3.2 Paul Eggleton (3): mraa: update to 2.0.0 upm: update to 2.0.0 picocom: update to 3.1 Pierre-Jean Texier (2): stunnel: bump to version 5.55 cppzmq: bump to version 4.4.1 Piotr Tworek (1): itstool: Don't use hardcoded, absolute path to python3 binary. Qi.Chen@windriver.com (3): turbostat: set PACKAGE_ARCH as MACHINE_ARCH esmtp: use alternatives to manage /usr/lib/sendmail postfix: use alternatives to manage /usr/lib/sendmail Radovan Scasny (2): dhcpcd: enable udev by default dhcpcd: fix building with pkgconfig Randy MacLeod (2): poppler: update from 0.75.0 to 0.79.0 rsyslog: update from 8.1903.0 to 8.1907.0 Ricardo Ribalda Delgado (1): fwts: Update to 19.06.00 Robert Joslyn (1): cryptsetup: Don't enable udev for native build Roman Stratiienko (1): glmark2: Upgrade SRCREV to latest Ross Burton (2): gtk+: add (from oe-core) gnome-themes-standard: add recipe for GTK+ 2 Adwaita Ruslan Bilovol (2): libnss-nisplus: Add recipe kpatch: fix QA build errors for nativesdk Saravanan Sekar (1): liblightmodbus: Add version 2.0.2 Scott Ellis (1): wireguard: Upgrade 20190406 to 20190702 Slater, Joseph (3): drbd-utils: enable reproducible_build awareness php: remove host specific info from header file mozjs: do not expose intl api for mips64 Tim Orling (9): libencode-perl: upgrade 2.94 -> 3.01; enable ptest libdbi-perl: fix dependencies libtest-nowarnings-perl: add recipe for 1.04 libdbd-sqlite-perl: upgrade 1.54 -> 1.62; enable ptest libsub-uplevel-perl: add recipe for 0.36 libtest-warn-perl: add recipe for 0.36 libcgi-perl: upgrade 4.43 -> 4.44 libnet-ldap-perl: upgrade 0.65 -> 0.66; enable ptest libunicode-linebreak-perl: upgrade 2017.004 -> 2019.001; enable ptest Trevor Gamblin (2): metacity; upgrade from 3.30.1 to 3.32.0 gvfs: upgrade from 1.40.0 to 1.40.2 Vincent Prince (1): mongodb: add mongo shell as a PACKAGECONF option William A. Kennington III via Openembedded-devel (5): gtest: Googletest project is back under github.com/google/googletest googletest: The gtest and gmock projects were combined under googletest in 2015 libtar: Enable libtar-native build fmt: Init at 5.3.0 cli11: 1.7.1 -> 1.8.0 Windel Bouwman (3): python-humanfriendly: Add recipe for the humanfriendly package. Fix python-humanfriendly recipe for python2. Add recipe for the coloredlogs python package. Yi Zhao (7): strongswan: upgrade 5.7.1 -> 5.8.0 snort: fix compile-host-path QA issue cryptsetup: set the default luks format to LUKS1 libldb: upgrade 1.5.4 -> 1.5.5 samba: upgrade 4.10.5 -> 4.10.6 snort: upgrade 2.9.13 -> 2.9.14 snort: upgrade 2.9.14 -> 2.9.14.1 Yong, Jonathan (1): icewm: add recipe Yongxin Liu (3): keyutils: move recipe and patches from meta-security to meta-oe ndctl: v63 -> v65 pmdk: update from 1.4.2 to 1.6 Yuan Chao (9): python-pycodestyle: upgrade 2.4.0 -> 2.5.0 python-lxml: upgrade 4.3.4 -> 4.4.0 python-configparser: upgrade 3.5.0 -> 3.7.4 protobuf: upgrade 3.9.0 -> 3.9.1 python-markupsafe: upgrade 1.0 -> 1.1.1 hostapd: upgrade 2.8 -> 2.9 python-configparser: upgrade 3.7.4 -> 3.8.1 python-lxml: upgrade 4.4.0 -> 4.4.1 python-pip: upgrade 19.2.1 -> 19.2.2 Zang Ruochen (47): postgresql: upgrade 11.3 -> 11.4 wireshark: upgrade 3.0.1 -> 3.0.2 python-pygobject: upgrade 3.32.1 -> 3.32.2 python-alembic: upgrade 1.0.10 -> 1.0.11 logwatch: upgrade 7.4.3 -> 7.5.1 tcsh: upgrade 6.20.00 -> 6.21.00 python-cython: upgrade 0.29.10 -> 0.29.11 dialog: upgrade 1.3-20180621 -> 1.3-20190211 php: upgrade 7.3.6 -> 7.3.7 sessreg: upgrade 1.1.1 -> 1.1.2 python-typing: upgrade 3.6.6 -> 3.7.4 python-mako: upgrade 1.0.12 -> 1.0.13 python-pbr: upgrade 5.2.1 -> 5.4.0 python-cython: upgrade 0.29.11 -> 0.29.12 adcli: added new recipe. python-pyflakes: upgrade 1.6.0 -> 2.1.1 python-protobuf: upgrade 3.8.0 -> 3.9.0 protobuf: upgrade 3.8.0 -> 3.9.0 setxkbmap: upgrade 1.3.1 -> 1.3.2 uftrace: upgrade 0.9.2 -> 0.9.3 wireshark: upgrade 3.0.2 -> 3.0.3 python-pbr: upgrade 5.4.0 -> 5.4.1 dstat: upgrade 0.7.3 -> 0.7.4 python-mako: upgrade 1.0.13 -> 1.0.14 xfsprogs: upgrade 5.0.0 -> 5.1.0 python-beautifulsoup4: upgrade 4.7.1 -> 4.8.0 xterm: upgrade 347 -> 348 python-pip: upgrade 19.1.1 -> 19.2.1 python-paste: upgrade 3.0.8 -> 3.1.0 syslog-ng: append syslog-ng.service dialog: upgrade 1.3-20190211 -> 1.3-20190728 openldap: upgrade 2.4.47 -> 2.4.48 python-cython: upgrade 0.29.12 -> 0.29.13 libsodium: upgrade 1.0.17 -> 1.0.18 hwdata: upgrade 0.322 -> 0.326 python-jsonpatch: upgrade 1.23 -> 1.24 python-pyasn1: upgrade 0.4.5 -> 0.4.6 python-pyasn1-modules: upgrade 0.2.2 -> 0.2.6 python-pyparsing: upgrade 2.4.0 -> 2.4.2 python-pytest-runner: upgrade 4.2 -> 5.1 python-pytz: upgrade 2019.1 -> 2019.2 itstool: upgrade 2.0.5 -> 2.0.6 opensaf: upgrade 5.19.03 -> 5.19.07 libkcapi: upgrade 1.1.4 -> 1.1.5 mcelog: upgrade 162 -> 164 php: upgrade 7.3.7 -> 7.3.8 kpatch: upgrade 0.61 -> 0.71 Zheng Ruoqin (3): python-mako: upgrade 1.0.14 -> 1.1.0 python-pbr: upgrade 5.4.1 -> 5.4.2 dnf-plugin-tui: new recipe wouterlucas (1): python-jsonref: add recipe meta-phosphor: fbd01b6e08..fe8cee7488: Brad Bishop (1): meta-phosphor: sdk: react to upstream gtest rename meta-xilinx: 64aa3d35ae..f3c8b1c9a8: Alejandro Enedino Hernandez Samaniego (7): opencl-clhpp: Allow empty packages to be built opencl-headers: Allow empty packages to be built gcc-8: rebase microblaze patches for gcc 8.2.0 gcc8: update microblaze patches gcc: update microblaze patches update gcc-8 patches gcc: Remove xilinx.ld requirement Jaewon Lee (6): zc1254-zynqmp.conf: Add support for zc1254 evaluation board zc1275-zynqmp.conf: Add support for zc1275 evaluation board zcu102-zynqmp.conf: Changing qemu boot mode Adding FPGA_MNGR_RECONFIG_ENABLE to control enabling fpga manager gcc: Removing already upstreamed patch Rebasing binutils patches from 2.31 to 2.32 Madhurkiran Harikrishnan (2): kernel-module-mali: Fix errors associated with kernel upgrade to 4.19 xf86-video-armsoc: Remove the recipe for xf86-video-armsoc Manjukumar Matha (10): libmali-xlnx_git.bb: Fix the package arch for libmali zcu111-zynqmp.conf: Add support for ZCU111 evaluation board qemu-system-aarch64-multiarch: Enable plm argument in runqemu arm-trusted-firmware.inc: Add support to build ATF for versal devices linux-xlnx.inc: Add support to build kernel for versal devices linux-xlnx.inc: Use KBUILD_DEFCONFIG in externalsrc mode if defined kernel-simpleimage.bbclass: Use dts for simpleImage generation for Microblaze kernel-simpleimage.bbclass: Deploy simpleImage unstrip file kernel-simpleimage.bbclass: Deploy simpleImage strip binutils%.bbappend: Update Microblaze binutils patches to v2.31 Min Ma (4): ocl-icd_git.bb: Add recipe for OpenCL ICD loaders opencl-clhpp_git.bb: Recipe for OpenCL Host API C++ bindings zocl: Recipe for Xilinx runtime driver module xrt: Xilinx Runtime User Space Libraries and headers Sai Hari Chandana Kalluri (1): xilinx-testimage.bbclass: Include IMAGE_AUTOLOGIN and IMAGE_FSTYPES values for runqemu Sreeja Vadakattu (1): machine-xilinx-default.inc: Make u-boot.elf as UBOOT_ELF for zynq Vineeth Chowdary Karumanchi (1): tune-zynq.inc: Build zImage in addition to uImage meta-security: c28b72e91d..ecb526ffab: Armin Kuster (34): linux-bbappends: simplify layers: set warrior only security-test-image: add a testing image runtime: clamav test cleanup packagegroup-core-security: cleanup and remove ptest test-image: add packagegroup-core-security-ptest test-image: add a few more packages to image ima-evm-utils: update to tip runtime: tpm2 fix names in packagecheck tpm2 images: create tpm2 image and fix packagegroup tpm image: split out tpm2 tpm2-pkcs11/tpm2-pkcs11: update to tip tpm2-tcti-uefi: update to tip tpm2-tools: update to 3.2.0 tpm2-tss: update to 2.2.3 tpm2-totp: update to offical release v0.1.1 tpm2-tss-engine: update to 1.0.0 libmspack: update SRC_URI and package clamav: minor recipe cleanup lynis: update to 2.7.5 meta-security-compliance: update README openscap_git: update to 1.3.0 openscap: add 1.3.1 recipes for upstream source scap-security-guide: update to 0.1.44 meta-security-compliance: add meta-python libldb: remove recipe waf-cross-answers: remove files samhain: update to 4.3.3 keyutils: remove from meta-security linux-%: remove kernel fragments now in cache meta-integrity: remove kernel fragments now in cache linux-stable/5.2: add stable bbappend linux-yocto: use 4.19 kernel cache now linux-yocto-dev: update to use kernel cache Dmitry Eremin-Solenikov (11): packagegroup-security-tpm2: stop including tpm2-tcti-uefi tpm2-tss: fix compilation when using updated AX_CODE_COVERAGE macro tpm2-tcti-uefi: add autoconf-archive-native dependency tpm2-tcti-uefi: fix configure arguments tpm2-tcti-uefi: stop inserting host directories into build path tpm2-tcti-uefi: build and install examples meta-integrity: rename IMA_EVM_BASE to INTEGRITY_BASE ima-evm-utils: bump to release 1.2.1 kernel-modsign.bbclass: add support for kernel modules signing linux: add support for kernel modules signing layer.conf: switch to keyutils from meta-oe He Zhe (1): kernel: Add conditional inclusion of fragments for linux-yocto-dev Mark Asselstine (1): openscap/scap-security-guide: use _git instead of versioned filenames Yi Zhao (5): openscap: update recipe scap-security-guide: update recipe openscap: cleanup DEPENDS scap-security-guide: fix typo xmlsec1: upgrade 1.2.27 -> 1.2.28 lumag (3): layer.conf: add dependency on meta-security ima-evm-utils: bump version ima-evm-utils: refresh xattr patch meta-raspberrypi: 8636b63752..b112816e95: Andrei Gherzan (46): rpi-base.inc: Include rpi4 dtb raspberrypi3.conf: Clarify machine mode linux-raspberrypi: Include configuration for RaspberryPi3 defconfig linux-raspberrypi: Update 4.19 kernel to 4.19.56 rpi-base: Rename the rpi0w dtb firmware: Update to 20190620 raspberrypi4.conf: Add initial machine 32 bit configuration linux-firmware-rpidistro: Fix WiFi on RaspberryPi 4 rpi-base.inc: Include the "fake" KMS dtbo raspberrypi4: Use vc4-fkms-v3d linux-raspberrypi: Bump 4.19 revision to fix RPi 4 arm64 builds raspberrypi4-64.conf: Introduce RPi arm64 machine firmware: Rename firmware inc file to raspberrypi-firmware.inc armstubs: Add support for compiling ARM stubs rpi-config: Handle ARMSTUB sdcard_image-rpi.bbclass: Include in the SD card image the armstub file raspberrypi4-64.conf: Initial machine configuration raspberrypi-tools: Update to remove Makefile patch linux-raspberrypi: Fix defconfig for RPi4-64 linux-raspberrypi.inc: Explicitly set defconfig for raspberrypi4-64 sdcard_image-rpi.bbclass: Fix typo linux-raspberrypi: Bump 4.19 revision to have proper coherent_pool set raspberrypi4-64.conf: Define a machine feature for armstubs sdcard_image-rpi.bbclass: Use armstub machine feature linux-raspberrypi: Bump 4.19.57 revision raspberrypi4.conf: Define uboot defconfig raspberrypi4-64.conf: Uboot configuration and drop armstub u-boot: Use a temporary fork for RPi4 support raspberrypi-firmware: Update to 20190709 raspberrypi4.conf: The firmware uses kernel7l.img when LPAE is supported linux-raspberrypi: Bump 4.19 to 4.19.58 linux-raspberrypi: Build dtbs with dtbs make target for all 64bit targets linux-raspberrypi: Bump 4.19 revision raspberrypi4-64.conf: Remove memory limitation u-boot: Replace custom fork by patches u-boot: Update patches for RPi4 rpi-config: Check for armstub based on machine feature sdcard_image-rpi: Check for armstub based on machine feature armstubs: Error out when ARMSTUBS is not defined raspberrypi*: Define ARMSTUB for all machines raspberrypi4-64.conf: Limit RAM to 3G README.md: Use matrix chat room raspberrypi-firmware.inc: Update to 20190718 linux-raspberrypi: Update 4.19 recipe to 4.19.66 mesa: Add v3d and kmsro driver as well raspberrypi4-64: Remove the 3G RAM limitation Carton (2): bluez5: Fixed typo (RC_URI -> SRC_URI) rpi-config: Check some config values against "1" Francesco Giancane (1): linux-raspberrypi: update to 4.14.114 Khem Raj (8): linux-raspberrypi: Upgrade to 4.19.57 userland: Upgrade to latest webkitgtk: Remove -DUSE_GSTREAMER_GL=OFF for vc4graphics layer.conf: Add meta-networking to dynamic layers drbd: Disable for rpi machines packagegroup-rpi-test: Depend on wireless-regdb instead of crda xorg-xserver: Adapt bbappend to latest OE-core python-rtimu,python-sense-hat: Convert to py3 modules Kirill Goncharov (1): omxplayer: Bump revision Martin Jansa (1): sdcard_image-rpi.bbclass: use -v for all mcopy calls and add bbfatal in case mcopy fails Riyaz (1): rpi-base.inc: Enabling open-source vc4graphics driver for all RPI platforms Change-Id: I9e37b5952a2e2e30745275fc89e4dd7c47b851e2 Signed-off-by: Brad Bishop --- meta-openembedded/meta-gnome/README | 20 --- .../meta-gnome/classes/sanity-meta-gnome.bbclass | 10 -- meta-openembedded/meta-gnome/conf/layer.conf | 4 - .../network-manager-applet_1.8.20.bb | 51 ------ .../network-manager-applet_1.8.22.bb | 44 +++++ .../0001-Bug-13770-Require-C-11-from-now-on.patch | 180 --------------------- ...saurus-Makefile.am-remove-uncomplete-opti.patch | 39 ----- .../recipes-gnome/abiword/abiword_3.0.2.bb | 142 ---------------- .../recipes-gnome/evince/evince_3.28.2.bb | 2 +- .../meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb | 4 +- .../gnome-bluetooth/gnome-bluetooth_3.18.2.bb | 2 +- .../gnome-desktop/gnome-desktop3_3.32.0.bb | 4 +- .../gnome-system-monitor_3.32.0.bb | 5 +- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb | 76 --------- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb | 82 ++++++++++ .../recipes-gnome/libgnome/libgnomekbd_3.26.1.bb | 4 +- .../recipes-gnome/libgsf/libgsf_1.14.45.bb | 4 +- .../recipes-gnome/libwnck/libwnck_2.31.0.bb | 1 - .../recipes-gnome/metacity/metacity_3.30.1.bb | 41 ----- .../recipes-gnome/metacity/metacity_3.32.0.bb | 41 +++++ ...se-foreign-mode-to-avoid-errors-with-miss.patch | 29 ---- ...vRTF.c-Specify-print-format-in-rtf_output.patch | 26 --- .../meta-gnome/recipes-gnome/wv/wv_1.2.9.bb | 18 --- 23 files changed, 178 insertions(+), 651 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.30.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README index 2a682e72d..3c5b4c5f9 100644 --- a/meta-openembedded/meta-gnome/README +++ b/meta-openembedded/meta-gnome/README @@ -1,23 +1,3 @@ -meta-gnome -=========== - -The recipe in this layer needs to have 'x11' in DISTRO_FEATURES -to have effect. To enable them, add in configuration file the following line. - - DISTRO_FEATURES_append = " x11" - -If meta-gnome is included, but x11 is not enabled as a -distro feature a warning is printed at parse time: - - You have included the meta-gnome layer, but - 'x11' has not been enabled in your DISTRO_FEATURES. - -If you know what you are doing, this warning can be disabled by setting the following -variable in your configuration: - - SKIP_META_GNOME_SANITY_CHECK = 1 - - Dependencies ------------ This layer depends on: diff --git a/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass b/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass deleted file mode 100644 index 331ea193d..000000000 --- a/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass +++ /dev/null @@ -1,10 +0,0 @@ -addhandler gnome_bbappend_distrocheck -gnome_bbappend_distrocheck[eventmask] = "bb.event.SanityCheck" -python gnome_bbappend_distrocheck() { - skip_check = e.data.getVar('SKIP_META_GNOME_SANITY_CHECK') == "1" - if 'x11' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check: - bb.warn("You have included the meta-gnome layer, but \ -'x11' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ -may not take effect. See the meta-gnome README for details on enabling \ -meta-gnome support.") -} diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf index 0b68232de..9ed142198 100644 --- a/meta-openembedded/meta-gnome/conf/layer.conf +++ b/meta-openembedded/meta-gnome/conf/layer.conf @@ -15,7 +15,3 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" LAYERSERIES_COMPAT_gnome-layer = "thud warrior" - -# Sanity check for meta-gnome layer. -# Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. -INHERIT += "sanity-meta-gnome" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb deleted file mode 100644 index 80aafc870..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+3 libnotify libsecret networkmanager \ - gconf libgnome-keyring iso-codes nss \ - intltool-native \ -" - -GNOMEBASEBUILDCLASS = "autotools-brokensep" -inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "06aafa851762146034351aa72ebb23d4" -SRC_URI[archive.sha256sum] = "050dbb155566c715239dc0378844d8beed10954e64e71014ecef8ca912df34ec" - -PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" -PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info" -PACKAGECONFIG ??= "" - -EXTRA_OECONF = " \ - --without-selinux \ -" - -do_configure_append() { - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${B} -name "Makefile") ; do - sed -i -e s%-Werror[^[:space:]]*%%g $i - done -} - -# gobject-introspection related -GI_DATA_ENABLED_libc-musl = "False" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs" -} - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/nm-applet/ \ - ${datadir}/libnma/wifi.ui \ - ${datadir}/metainfo \ -" - -# musl builds generate gir files which otherwise go un-packaged -FILES_${PN}-dev += " \ - ${datadir}/gir-1.0 \ -" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb new file mode 100644 index 000000000..37f512a73 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb @@ -0,0 +1,44 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gtk+3 libnotify libsecret networkmanager \ + libgnome-keyring iso-codes nss \ + intltool-native \ +" + +GNOMEBASEBUILDCLASS = "autotools-brokensep" +inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "e0373f4c0d0637716e6e385799a9080f" +SRC_URI[archive.sha256sum] = "ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed" + +PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" +PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info" +PACKAGECONFIG ??= "" + +EXTRA_OECONF = " \ + --without-selinux \ +" + +# gobject-introspection related +GI_DATA_ENABLED_libc-musl = "False" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs" +} + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" + +# musl builds generate gir files which otherwise go un-packaged +FILES_${PN}-dev += " \ + ${datadir}/gir-1.0 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch deleted file mode 100644 index 3731a23f1..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch +++ /dev/null @@ -1,180 +0,0 @@ -From f6d0dc338fe867c1b064682ae7f15bffe019b306 Mon Sep 17 00:00:00 2001 -From: Hubert Figuiere -Date: Tue, 12 Apr 2016 02:55:47 +0000 -Subject: [PATCH] Bug 13770 - Require C++11 from now on. - -git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35197 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 - -Upstream-Status: Backport -Signed-off-by: Khem Raj ---- - ax_cxx_compile_stdcxx_11.m4 | 133 +++++++++++++++++++++++++++++++++++ - configure.ac | 1 + - src/wp/ap/gtk/ap_UnixApp.cpp | 2 +- - 3 files changed, 135 insertions(+), 1 deletion(-) - create mode 100644 ax_cxx_compile_stdcxx_11.m4 - -diff --git a/ax_cxx_compile_stdcxx_11.m4 b/ax_cxx_compile_stdcxx_11.m4 -new file mode 100644 -index 0000000..af37acd ---- /dev/null -+++ b/ax_cxx_compile_stdcxx_11.m4 -@@ -0,0 +1,133 @@ -+# ============================================================================ -+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -+# ============================================================================ -+# -+# SYNOPSIS -+# -+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the C++11 -+# standard; if necessary, add switches to CXXFLAGS to enable support. -+# -+# The first argument, if specified, indicates whether you insist on an -+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -+# -std=c++11). If neither is specified, you get whatever works, with -+# preference for an extended mode. -+# -+# The second argument, if specified 'mandatory' or if left unspecified, -+# indicates that baseline C++11 support is required and that the macro -+# should error out if no mode with that support is found. If specified -+# 'optional', then configuration proceeds regardless, after defining -+# HAVE_CXX11 if and only if a supporting mode is found. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Benjamin Kosnik -+# Copyright (c) 2012 Zack Weinberg -+# Copyright (c) 2013 Roy Stogner -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 3 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check check_type; -+ check_type c; -+ check_type&& cr = static_cast(c); -+ -+ auto d = a; -+]) -+ -+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl -+ m4_if([$1], [], [], -+ [$1], [ext], [], -+ [$1], [noext], [], -+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl -+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], -+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], -+ [$2], [optional], [ax_cxx_compile_cxx11_required=false], -+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl -+ AC_LANG_PUSH([C++])dnl -+ ac_success=no -+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default, -+ ax_cv_cxx_compile_cxx11, -+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [ax_cv_cxx_compile_cxx11=yes], -+ [ax_cv_cxx_compile_cxx11=no])]) -+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then -+ ac_success=yes -+ fi -+ -+ m4_if([$1], [noext], [], [dnl -+ if test x$ac_success = xno; then -+ for switch in -std=gnu++11 -std=gnu++0x; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ -+ m4_if([$1], [ext], [], [dnl -+ if test x$ac_success = xno; then -+ for switch in -std=c++11 -std=c++0x; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ AC_LANG_POP([C++]) -+ if test x$ax_cxx_compile_cxx11_required = xtrue; then -+ if test x$ac_success = xno; then -+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) -+ fi -+ else -+ if test x$ac_success = xno; then -+ HAVE_CXX11=0 -+ AC_MSG_NOTICE([No compiler with C++11 support was found]) -+ else -+ HAVE_CXX11=1 -+ AC_DEFINE(HAVE_CXX11,1, -+ [define if the compiler supports basic C++11 syntax]) -+ fi -+ -+ AC_SUBST(HAVE_CXX11) -+ fi -+]) -diff --git a/configure.ac b/configure.ac -index 48228be..f7be7de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -131,6 +131,7 @@ win_pkgs="$enchant_req" - - AC_PROG_CC - AC_PROG_CXX -+AX_CXX_COMPILE_STDCXX_11(noext,mandatory) - #AC_PROG_OBJC - AC_PROG_INSTALL - # For libtool 1.5.x compatability (AC_PROG_LIBTOOL is deprecated version of LT_INIT) -diff --git a/src/wp/ap/gtk/ap_UnixApp.cpp b/src/wp/ap/gtk/ap_UnixApp.cpp -index 061a304..260f8e5 100644 ---- a/src/wp/ap/gtk/ap_UnixApp.cpp -+++ b/src/wp/ap/gtk/ap_UnixApp.cpp -@@ -863,7 +863,7 @@ static bool is_so (const char *file) { - if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename - return false; - const char *suffix = file+(len-3); -- if(0 == strcmp (suffix, "."G_MODULE_SUFFIX)) -+ if(0 == strcmp (suffix, "." G_MODULE_SUFFIX)) - return true; - return false; - } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch deleted file mode 100644 index 0dff1411d..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c646159ce817506131b58fdab1cdc1cd6364df7a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 7 Feb 2016 21:45:20 +0100 -Subject: [PATCH] plugins/aiksaurus/Makefile.am: remove uncomplete options - WITH_BUILTIN_AIKSAURUS_GTK -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* with gtk2 we won't use it -* it is missing in configure.ac causing - -| plugins/aiksaurus/Makefile.am:5: error: WITH_BUILTIN_AIKSAURUS_GTK does not appear in AM_CONDITIONAL - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - plugins/aiksaurus/Makefile.am | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am -index d402c58..1034e2a 100644 ---- a/plugins/aiksaurus/Makefile.am -+++ b/plugins/aiksaurus/Makefile.am -@@ -2,10 +2,6 @@ SUBDIRS = - - if TOOLKIT_GTK - --if WITH_BUILTIN_AIKSAURUS_GTK --SUBDIRS += aiksaurusgtk3 --platform_lib = aiksaurusgtk3/libAiksaurusGtk3.la --endif - - endif - --- -2.5.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb deleted file mode 100644 index 36b056fdd..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "AbiWord is free word processing program similar to Microsoft(r) Word" -HOMEPAGE = "http://www.abiword.org" -SECTION = "x11/office" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" -DEPENDS = " \ - perl-native \ - gtk+ \ - gtkmathview \ - wv \ - fribidi \ - jpeg \ - libpng \ - librsvg \ - libwmf-native \ - asio \ - evolution-data-server \ - libxslt \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \ -" -RDEPENDS_${PN}_append_libc-glibc = " \ - glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \ -" -RCONFLICTS_${PN} = "${PN}-embedded" - -SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \ - file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \ - file://0001-Bug-13770-Require-C-11-from-now-on.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" - -SRC_URI[md5sum] = "cda6dd58c747c133b421cc7eb18f5796" -SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522" - -#want 3.x from 3.x.y for the installation directory -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -inherit distro_features_check autotools-brokensep pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG ??= " \ - collab-backend-xmpp collab-backend-tcp \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \ -" -PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2" -PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant" -PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth" -PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2" -PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls" -PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control" -PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib" - -EXTRA_OECONF = " --disable-static \ - --enable-plugins \ - --enable-clipart \ - --enable-templates \ - --without-gnomevfs \ - --with-gtk2 \ - --with-libwmf-config=${STAGING_DIR} \ -" - -LDFLAGS += "-lgmodule-2.0" - -do_compile() { - cd goffice-bits2 - make goffice-paths.h - make libgoffice.la - cd ${B} - oe_runmake -} - -PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates " - -FILES_${PN} += " \ - ${libdir}/lib${PN}-*.so \ - ${datadir}/mime-info \ - ${datadir}/icons/* \ - ${datadir}/${PN}-${SHRT_VER}/glade \ - ${datadir}/${PN}-${SHRT_VER}/scripts \ - ${datadir}/${PN}-${SHRT_VER}/system.profile-en \ - ${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \ - ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \ - ${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \ - ${datadir}/${PN}-${SHRT_VER}/certs \ - ${datadir}/${PN}-${SHRT_VER}/ui \ - ${datadir}/${PN}-${SHRT_VER}/xsl* \ - ${datadir}/${PN}-${SHRT_VER}/mime-info \ - ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \ -" - -# don't steal /usr/lib/libabiword-3.0.so from ${PN} -# in this case it's needed in ${PN} -FILES_${PN}-dev = " \ - ${includedir} \ - ${libdir}/pkgconfig \ - ${libdir}/${PN}*.la \ - ${libdir}/lib${PN}*.la \ - ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \ -" -FILES_${PN}-dbg += "${libdir}/${PN}-${SHRT_VER}/plugins/.debug" -FILES_${PN}-doc += "${datadir}/${PN}-*/readme*" - -FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/strings" -FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*" -FILES_${PN}-clipart += "${datadir}/${PN}-${SHRT_VER}/clipart" -FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings" -FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*" -FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates" - -PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*" - -python populate_packages_prepend () { - abiword_libdir = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins') - do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') - - metapkg = "abiword-meta" - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") - blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] - metapkg_rdepends = [] - packages = d.getVar('PACKAGES').split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): - print("Modifying %s" % pkg) - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package') - packages.append(metapkg) - d.setVar('PACKAGES', ' '.join(packages)) -} - -FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb index d2885906f..f45180e79 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" SECTION = "x11/office" DEPENDS = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native" -inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd +inherit gnomebase pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd SRC_URI = " \ ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index ea6439d91..6e0720888 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -3,13 +3,13 @@ SECTION = "x11/gnome" LICENSE = "GPLv2+" PR = "r2" -DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ \ +DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 glib-2.0-native gtk+ \ gtksourceview2 iso-codes intltool-native gnome-common-native \ libice python3-six-native" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit distro_features_check gnome gettext python3native +inherit distro_features_check gnomebase gconf gettext python3native REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb index 8cfd65af3..d0eebda38 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ SECTION = "x11/gnome" DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native gnome-common-native \ - ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)} \ + bluez5 \ " inherit gnomebase gtk-icon-cache gobject-introspection distro_features_check diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb index 0acbb2117..85ee5e6cf 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb @@ -8,7 +8,7 @@ BPN = "gnome-desktop" GNOMEBASEBUILDCLASS = "meson" -inherit gnome pkgconfig upstream-version-is-even gobject-introspection distro_features_check +inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" @@ -25,7 +25,7 @@ SRC_URI += " \ DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" inherit distro_features_check gtk-doc -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES += "x11" GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Ddesktop_docs=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb index c2432a322..8930e1222 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb @@ -10,13 +10,14 @@ DEPENDS = " \ gtkmm3 \ libgtop \ librsvg \ + polkit \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-icon-cache distro_features_check gettext +inherit gnomebase gconf gtk-icon-cache distro_features_check gettext -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit" SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd" SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb deleted file mode 100644 index 7caee2771..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb +++ /dev/null @@ -1,76 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnome bash-completion gettext upstream-version-is-even - -DEPENDS += "libsecret glib-2.0 gconf libgudev udisks2 polkit shadow-native" - -SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" - -SRC_URI[archive.md5sum] = "96ef53ed613e4d223e0db3a7acea44f0" -SRC_URI[archive.sha256sum] = "3739d64b79c95a9f0f9faf2c5f9e5298b4b2ebdd6431435ce656ecd19b31e2f2" - - -EXTRA_OEMESON = " \ - -Dbluray=false \ - -Dgoa=false \ - -Dgoogle=false \ - -Dnfs=false \ - -Dudisks2=true \ -" - -PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" - -FILES_${PN} += " \ - ${datadir}/glib-2.0 \ - ${datadir}/GConf \ - ${datadir}/dbus-1/services \ - ${libdir}/gio/modules/*.so \ - ${libdir}/tmpfiles.d \ - ${systemd_user_unitdir} \ -" -RDEPENDS_${PN} = "udisks2" - -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" -FILES_${PN}-dev += "${libdir}/gio/modules/*.la" - -FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" -FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" -FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" - -RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" - -PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" -PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" -PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" -PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" -PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" -PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" -PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" -PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" -PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" - -# needs meta-filesystems -PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" - -# libcdio-paranoia recipe doesn't exist yet -PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" - -do_install_append() { - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d - - # After rebuilds (not from scracth) it can happen that the executables in - # libexec ar missing executable permission flag. Not sure but it came up - # during transition to meson. Looked into build files and logs but could - # not find suspicious - for exe in `find ${D}/${libexecdir}`; do - chmod +x $exe - done -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb new file mode 100644 index 000000000..4fca1076f --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb @@ -0,0 +1,82 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase bash-completion gettext upstream-version-is-even + +DEPENDS += "libsecret glib-2.0 glib-2.0-native gconf libgudev shadow-native" + +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" + +SRC_URI[archive.md5sum] = "47db9bec616e089513b7f1386e5c7d5f" +SRC_URI[archive.sha256sum] = "bdefe8fec6a1097f0c126fa2a4533667c98a86e237ac640518000e16b363971e" + + +EXTRA_OEMESON = " \ + -Dbluray=false \ + -Dgoa=false \ + -Dgoogle=false \ + -Dnfs=false \ +" + +PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" + +FILES_${PN} += " \ + ${datadir}/glib-2.0 \ + ${datadir}/GConf \ + ${datadir}/dbus-1/services \ + ${libdir}/gio/modules/*.so \ + ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ +" + +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES_${PN}-dev += "${libdir}/gio/modules/*.la" + +FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" +FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" +FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" + +RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" + +PACKAGECONFIG ?= "libgphoto2 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ + " + +PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" +PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" +PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" +PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" +PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" +PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" +PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" +PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" +PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" +PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" + +# needs meta-filesystems +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" + +# libcdio-paranoia recipe doesn't exist yet +PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi + + # After rebuilds (not from scracth) it can happen that the executables in + # libexec ar missing executable permission flag. Not sure but it came up + # during transition to meson. Looked into build files and logs but could + # not find suspicious + for exe in `find ${D}/${libexecdir}`; do + chmod +x $exe + done +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb index 3a7379f9e..d9f643106 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb @@ -6,12 +6,10 @@ SECTION = "x11/gnome/libs" DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" -inherit distro_features_check gnome gobject-introspection gettext +inherit distro_features_check gnomebase gobject-introspection gettext REQUIRED_DISTRO_FEATURES = "x11" -GNOME_COMPRESS_TYPE = "xz" - SRC_URI[archive.md5sum] = "98040022484406e7ebe25f82cef93344" SRC_URI[archive.sha256sum] = "f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb index e63e26e73..ac36ceb04 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb @@ -7,15 +7,13 @@ SECTION = "libs" DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native gnome-common-native" -inherit autotools pkgconfig gnome gconf gobject-introspection +inherit autotools pkgconfig gnomebase gobject-introspection SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" SRC_URI[archive.md5sum] = "e45cc8aa9c49516d540b7d7307f755f1" SRC_URI[archive.sha256sum] = "5cbc2c0f1dc44d202fa0c6e3a51e9f17b0c2deb8711ba650432bfde3180b69fa" -GNOME_COMPRESS_TYPE = "xz" - PACKAGECONFIG ??= "" PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index ea4c8df53..f50b9ceb9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -11,7 +11,6 @@ PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-s inherit gnomebase gobject-introspection distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -GNOME_COMPRESS_TYPE = "xz" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.30.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.30.1.bb deleted file mode 100644 index 253f7ef36..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.30.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SECTION = "x11/wm" -SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ - file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" - -PE = "1" - -DEPENDS = "gsettings-desktop-schemas startup-notification \ - gnome-doc-utils gdk-pixbuf-native \ - gtk+3 glib-2.0 libcanberra libgtop intltool-native" - -inherit autotools gettext gnomebase distro_features_check -# depends on startup-notification which depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "git://github.com/GNOME/metacity.git;branch=master \ - file://0001-drop-zenity-detection.patch \ -" - -S = "${WORKDIR}/git" -SRCREV = "d69fba052cdd0aa8348dc1bbbbb1ecbadfbebbd8" - -EXTRA_OECONF += "--disable-xinerama" - -PACKAGECONFIG ?= "" - -# enable as neccessary until new warnings are dealt with -PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," - -do_configure_prepend() { - cd ${S} - aclocal --install || exit 1 - autoreconf --verbose --force --install -Wno-portability || exit 1 - cd - - -} - -FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" -RDEPENDS_${PN} += "gsettings-desktop-schemas" - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb new file mode 100644 index 000000000..ef6ea7946 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb @@ -0,0 +1,41 @@ +SECTION = "x11/wm" +SUMMARY = "Metacity is the boring window manager for the adult in you" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ + file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" + +PE = "1" + +DEPENDS = "gsettings-desktop-schemas startup-notification \ + gnome-doc-utils gdk-pixbuf-native \ + gtk+3 glib-2.0 libcanberra libgtop intltool-native" + +inherit autotools gettext gnomebase distro_features_check +# depends on startup-notification which depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "git://github.com/GNOME/metacity.git;branch=master \ + file://0001-drop-zenity-detection.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "bf1bfbadf47eff97703df17e95b15168e2034222" + +EXTRA_OECONF += "--disable-xinerama" + +PACKAGECONFIG ?= "" + +# enable as neccessary until new warnings are dealt with +PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," + +do_configure_prepend() { + cd ${S} + aclocal --install || exit 1 + autoreconf --verbose --force --install -Wno-portability || exit 1 + cd - + +} + +FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" +RDEPENDS_${PN} += "gsettings-desktop-schemas" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch deleted file mode 100644 index a8c5bc796..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eebe1f27f4b27b05eb4b9b55f9df1124acf4d092 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 1 Aug 2014 12:25:24 +0200 -Subject: [PATCH] configure: use 'foreign' mode to avoid errors with missing - NEWS/AUTHORS/etc - -Upstream-status: Pending - -Signed-off-by: Koen Kooi ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3d7eef6..1784bdd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,7 +41,7 @@ VERSION=$WV_VERSION - PACKAGE=wv - - dnl Initialize automake stuff --AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - # Specify a configuration file - AM_CONFIG_HEADER(config.h) --- -1.9.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch deleted file mode 100644 index 2fc3f367f..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 079529b8d5e339e2211fa2f8c15543a738a627bc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 14:50:51 -0700 -Subject: [PATCH] wvRTF.c: Specify print format in rtf_output() - -Signed-off-by: Khem Raj ---- - wvRTF.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wvRTF.c b/wvRTF.c -index 361d258..4f24b30 100644 ---- a/wvRTF.c -+++ b/wvRTF.c -@@ -192,7 +192,7 @@ output_rtfUserData (rtfUserData * ud) - rtf_output_char ('{'); - - /* font color */ -- rtf_output (rtfColors[ud->cCol]); -+ rtf_output ("%s", rtfColors[ud->cCol]); - - /* font face */ - rtf_output ("\\f%d", ud->cFont); --- -2.13.2 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb deleted file mode 100644 index 72b8508a2..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Programs for accessing Microsoft Word documents" -HOMEPAGE = "http://wvware.sourceforge.net/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f" - -DEPENDS = "libgsf glib-2.0 libpng" - -SRC_URI = "https://www.abisource.com/downloads/wv/${PV}/${BP}.tar.gz \ - file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \ - file://0001-wvRTF.c-Specify-print-format-in-rtf_output.patch \ - " - -SRC_URI[md5sum] = "dbccf2e9f747e50c913b7e3d126b73f7" -SRC_URI[sha256sum] = "4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d" - -inherit autotools pkgconfig - -EXTRA_OECONF = "" -- cgit v1.2.3 From 90ca747aa04f375af7ff86462a52028245b174b9 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 20 Aug 2019 09:15:15 -0400 Subject: meta-openembedded: subtree update: c95842cdca..509d40153d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Andreas Müller (13): xfce4-whiskermenu-plugin: upgrade 2.3.2 -> 2.3.3 xfmpc: upgrade 0.2.3 -> 0.3.0 xfce4-cpugraph-plugin: upgrade 1.0.5 -> 1.1.0 xfce4-terminal: upgrase 0.8.7.4 -> 0.8.8 gtksourceview3: upgrade 3.24.10 -> 3.24.11 mousepad: move to gtk3 mousepad: upgrade 0.4.1 -> 0.4.2 ristretto: upgrade 0.8.4 -> 0.10.0 catfish: upgrade 1.4.7 -> 1.4.8 xfce4-datetime-plugin: upgrade 0.7.1 -> 0.8.0 xfce4-places-plugin: 1.8.0 -> 1.8.1 xfce4-pulseaudio-plugin: upgrade 0.4.1 -> 0.4.2 parole: upgrade 1.0.2 -> 1.0.4 Brad Bishop (1): cli11: Remove dev pkg dep to main pkg Kai Kang (1): packagegroup-tools-bluetooth: correct RDEPENDS Khem Raj (8): libopus: Limit forcing ARM mode ISA to v5 only mime-construct,libextutils-parsexs-perl: add runtime dependency on perl webmin: Add perl to rdeps for modules hplip: Add python to rdeps klibc: Disable bcmp builtin for clang on glibc as well python3-blivet: Add python3 to rdeps grubby: Add bash to rdeps ufs-tool: Do not force static linking Martin Jansa (10): nodejs: fix QA error about /usr/bin/python dependency iotop: add runtime dependency on python-core freeradius: add runtime dependency on perl scsirastools: add runtime dependency on bash libcec: add runtime dependency on python3-core dnf-plugin-tui: add runtime dependency on bash edac-utils: add runtime dependency on perl lmsensors: add runtime dependency on bash libdbi-perl: add runtime dependency on perl scsirastools: add runtime dependency on bash II Piotr Tworek (4): telepathy-glib: Update to version 0.24.1 telepathy-glib: Enable vala bindings gnome-themes-standard: Update to version 3.28 libgdata: Update to version 0.17.10. Slater, Joseph (1): php: zlib and zip support Yuan Chao (3): xfsprogs: upgrade 5.1.0 -> 5.2.0 xfsdump: fix error to work with xfsprogs 5.2.0 python-pymongo: upgrade 3.8.0 -> 3.9.0 Change-Id: I9450310b0c5abd766ecd0ee21c9338159b36e940 Signed-off-by: Brad Bishop --- .../recipes-utils/ufs-tool/ufs-tool_git.bb | 5 +- .../files/work-with-new-version-of-xfsprogs.patch | 28 +++++++++ .../recipes-utils/xfsdump/xfsdump_3.1.8.bb | 1 + .../recipes-utils/xfsprogs/xfsprogs_5.1.0.bb | 73 ---------------------- .../recipes-utils/xfsprogs/xfsprogs_5.2.0.bb | 73 ++++++++++++++++++++++ .../gtksourceview/gtksourceview3_3.24.10.bb | 21 ------- .../gtksourceview/gtksourceview3_3.24.11.bb | 21 +++++++ .../recipes-gnome/libgdata/libgdata_0.16.1.bb | 33 ---------- .../recipes-gnome/libgdata/libgdata_0.17.10.bb | 30 +++++++++ .../recipes-devtools/grubby/grubby_8.40.bb | 1 + .../recipes-devtools/grubby/grubby_git.bb | 1 + .../recipes-devtools/klibc/klibc.inc | 2 +- .../freeradius/freeradius_3.0.17.bb | 2 +- .../recipes-bsp/edac-utils/edac-utils_git.bb | 6 +- .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 2 +- .../packagegroups/packagegroup-tools-bluetooth.bb | 2 +- .../telepathy/telepathy-glib_0.24.0.bb | 16 ----- .../telepathy/telepathy-glib_0.24.1.bb | 18 ++++++ .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 25 ++++---- .../recipes-devtools/nodejs/nodejs_10.16.2.bb | 2 +- .../recipes-devtools/perl/libdbi-perl_1.642.bb | 1 + .../meta-oe/recipes-devtools/php/php.inc | 4 +- .../meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | 1 + .../meta-oe/recipes-extended/iotop/iotop_0.6.bb | 2 +- .../meta-oe/recipes-extended/libcec/libcec_git.bb | 2 +- .../scsirastools/scsirastools_1.6.6.bb | 4 +- .../gnome-themes/gnome-themes-standard_3.22.3.bb | 46 -------------- .../gnome-themes/gnome-themes-standard_3.28.bb | 45 +++++++++++++ .../recipes-multimedia/libopus/libopus_1.1.3.bb | 2 +- .../meta-oe/recipes-support/cli11/cli11_1.8.0.bb | 3 + .../mime-construct/mime-construct_1.11.bb | 2 +- .../libextutils/libextutils-parsexs-perl_3.35.bb | 2 +- .../recipes-devtools/python/python-pymongo.inc | 4 +- .../python/python-pymongo_3.8.0.bb | 2 - .../python/python-pymongo_3.9.0.bb | 2 + .../python/python3-pymongo_3.8.0.bb | 2 - .../python/python3-pymongo_3.9.0.bb | 2 + .../python-blivet/python3-blivet_3.1.4.bb | 2 +- .../recipes-webadmin/webmin/webmin_1.850.bb | 4 +- .../recipes-apps/catfish/catfish_1.4.7.bb | 17 ----- .../recipes-apps/catfish/catfish_1.4.9.bb | 17 +++++ .../recipes-apps/mousepad/mousepad_0.4.1.bb | 19 ------ .../recipes-apps/mousepad/mousepad_0.4.2.bb | 16 +++++ .../0001-Fix-build-after-update-of-xfconf.patch | 40 ------------ .../recipes-apps/ristretto/ristretto_0.10.0.bb | 16 +++++ .../recipes-apps/ristretto/ristretto_0.8.4.bb | 16 ----- .../xfce4-terminal/xfce4-terminal_0.8.7.4.bb | 14 ----- .../xfce4-terminal/xfce4-terminal_0.8.8.bb | 14 +++++ .../recipes-multimedia/parole/parole_1.0.2.bb | 36 ----------- .../recipes-multimedia/parole/parole_1.0.4.bb | 33 ++++++++++ .../recipes-multimedia/xfmpc/xfmpc_0.2.3.bb | 16 ----- .../recipes-multimedia/xfmpc/xfmpc_0.3.0.bb | 16 +++++ .../cpugraph/xfce4-cpugraph-plugin_1.0.5.bb | 9 --- .../cpugraph/xfce4-cpugraph-plugin_1.1.0.bb | 9 +++ .../datetime/xfce4-datetime-plugin_0.7.1.bb | 9 --- .../datetime/xfce4-datetime-plugin_0.8.0.bb | 9 +++ .../places/xfce4-places-plugin_1.8.0.bb | 13 ---- .../places/xfce4-places-plugin_1.8.1.bb | 13 ++++ .../pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb | 17 ----- .../pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb | 17 +++++ .../whiskermenu/xfce4-whiskermenu-plugin_2.3.2.bb | 11 ---- .../whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb | 11 ++++ 62 files changed, 440 insertions(+), 442 deletions(-) create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.22.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.9.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch create mode 100644 meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.8.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.4.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb index e074b5197..208ac3c58 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb @@ -12,8 +12,11 @@ SRC_URI = "git://github.com/westerndigitalcorporation/ufs-tool.git;protocol=git; S = "${WORKDIR}/git" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}"" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}"" +do_configure() { + sed -i -e "s|-static$||g" ${S}/Makefile +} do_install() { install -d ${D}${bindir}/ install -c -m 755 ${S}/ufs-tool ${D}${bindir}/ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch new file mode 100644 index 000000000..4ce23d717 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch @@ -0,0 +1,28 @@ +Make it work with xfsprogs 5.2.0. + +"xfs_fsop_geom_v1_t" has changed to "struct xfs_fsop_geom_v1" +in xfsprogs since version 5.2.0. + +Upstream-Status: Pending + +Signed-off-by: Yuan Chao +--- + common/fs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/fs.c b/common/fs.c +index 60cf0fd..2cc7031 100644 +--- a/common/fs.c ++++ b/common/fs.c +@@ -204,7 +204,7 @@ fs_mounted( char *typs, char *chrs, char *mnts, uuid_t *idp ) + int + fs_getid( char *mnts, uuid_t *idb ) + { +- xfs_fsop_geom_v1_t geo; ++ struct xfs_fsop_geom_v1 geo; + int fd; + + fd = open( mnts, O_RDONLY ); +-- +2.7.4 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb index 54ab30cbb..0421aa06d 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb @@ -12,6 +12,7 @@ DEPENDS = "xfsprogs attr" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ file://remove-install-as-user.patch \ + file://work-with-new-version-of-xfsprogs.patch \ " SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb deleted file mode 100644 index 0130fd227..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "XFS Filesystem Utilities" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2 & LGPLv2.1" -LICENSE_libhandle = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ - file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" -DEPENDS = "util-linux util-linux-native" -SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ - file://remove_flags_from_build_flags.patch \ - file://0001-build-Check-for-sync_file_range-libc-function.patch \ - file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ - file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ - " -SRC_URI[md5sum] = "7199b7aaf088d82fc8a1660ffeb63626" -SRC_URI[sha256sum] = "ca8b4e73dfc5b6227bb6d4e73d019035a1975b83ea41e218cdff15058a9f6c45" - -inherit autotools-brokensep - -PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" - -DEPENDS += "util-linux" - -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" - -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" -FILES_${PN}-repair = "${base_sbindir}/xfs_repair" - -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" - -EXTRA_OECONF = "--enable-gettext=no \ - --enable-scrub=no \ - INSTALL_USER=root \ - INSTALL_GROUP=root \ - ac_cv_header_aio_h=yes \ - ac_cv_lib_rt_lio_listio=yes \ -" - -DISABLE_STATIC = "" -EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" - -PACKAGECONFIG ??= "readline blkid" - -PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" -PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" - -export DEBUG="-DNDEBUG" -export BUILD_VERBOSE="1" -export tagname="CC" - -EXTRA_OEMAKE = "DIST_ROOT='${D}'" - -do_configure () { - export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure - # Recreate configure script. - oe_runmake configure - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} - -do_install_append() { - oe_runmake 'DESTDIR=${D}' install-dev - rm ${D}${libdir}/*.la - rmdir --ignore-fail-on-non-empty ${D}${libdir} - - ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a - ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so -} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb new file mode 100644 index 000000000..10d1b70d5 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb @@ -0,0 +1,73 @@ +SUMMARY = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2 & LGPLv2.1" +LICENSE_libhandle = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" +DEPENDS = "util-linux util-linux-native" +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ + file://remove_flags_from_build_flags.patch \ + file://0001-build-Check-for-sync_file_range-libc-function.patch \ + file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ + file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ + " +SRC_URI[md5sum] = "e38032818aa3b1ef224a69b6184fc12a" +SRC_URI[sha256sum] = "e41cdaa43d92b38c8a12ce9cb612ab911ba0e019c2e0762c494a8a601f533fd6" + +inherit autotools-brokensep + +PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" + +DEPENDS += "util-linux" + +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" + +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" +FILES_${PN}-repair = "${base_sbindir}/xfs_repair" + +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" + +EXTRA_OECONF = "--enable-gettext=no \ + --enable-scrub=no \ + INSTALL_USER=root \ + INSTALL_GROUP=root \ + ac_cv_header_aio_h=yes \ + ac_cv_lib_rt_lio_listio=yes \ +" + +DISABLE_STATIC = "" +EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" + +PACKAGECONFIG ??= "readline blkid" + +PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" +PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" + +export DEBUG="-DNDEBUG" +export BUILD_VERBOSE="1" +export tagname="CC" + +EXTRA_OEMAKE = "DIST_ROOT='${D}'" + +do_configure () { + export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure + # Recreate configure script. + oe_runmake configure + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} + +do_install_append() { + oe_runmake 'DESTDIR=${D}' install-dev + rm ${D}${libdir}/*.la + rmdir --ignore-fail-on-non-empty ${D}${libdir} + + ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a + ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb deleted file mode 100644 index d91e479d8..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Portable C library for multiline text editing" -HOMEPAGE = "http://projects.gnome.org/gtksourceview/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" - -PNAME = "gtksourceview" - -S = "${WORKDIR}/${PNAME}-${PV}" - -inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz" -SRC_URI[md5sum] = "e43337d17c40eae440a76630db76c54e" -SRC_URI[sha256sum] = "ab5406cdd0bdcf66afcd52b1e048a2f43c0f3ab391644ee30d9ac419b93cd59b" - -FILES_${PN} += " ${datadir}/gtksourceview-3.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb new file mode 100644 index 000000000..f7884930c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -0,0 +1,21 @@ +SUMMARY = "Portable C library for multiline text editing" +HOMEPAGE = "http://projects.gnome.org/gtksourceview/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" + +PNAME = "gtksourceview" + +S = "${WORKDIR}/${PNAME}-${PV}" + +inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz" +SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67" +SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd" + +FILES_${PN} += " ${datadir}/gtksourceview-3.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb deleted file mode 100644 index 80cbae39f..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE = "http://live.gnome.org/libgdata" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ - file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ - file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" - -DEPENDS = "gnome-common-native libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" - -inherit distro_features_check gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -do_configure_prepend_class-target () { - # introspection.m4 pre-packaged with upstream tarballs does not yet - # have our fixes - rm -f ${S}/introspection.m4 - - # remove the pre-built gtk-doc files, as they're installed (or attempted to be installed) - # even if gtk-doc is explicitly disabled - rm -rf ${S}/docs/reference/html -} - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" -} - -EXTRA_OECONF += "--disable-goa --disable-tests --disable-gtk-doc" - -SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d" -SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.10.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.10.bb new file mode 100644 index 000000000..7bedd87ad --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.10.bb @@ -0,0 +1,30 @@ +SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol" +HOMEPAGE = "http://live.gnome.org/libgdata" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ + file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ + file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" + +DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" + +GTKDOC_MESON_OPTION = "gtk_doc" +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" +PACKAGECONFIG[goa] = "-Dgoa=enabled,-Dgoa=disabled,gnome-online-accounts" +PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" + +EXTRA_OEMESON = "-Dalways_build_tests=false" + +SRC_URI[archive.md5sum] = "d858d411ad394c275643b14993dfeed4" +SRC_URI[archive.sha256sum] = "c1d3d1f303f6a0416a0dac355a195276c31157a74bb1d040772d46d1cb15b012" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb index dc3a70bb5..7403cf64f 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb @@ -35,6 +35,7 @@ do_install_ptest() { sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh } +RDEPENDS_${PN} += "bash" RDEPENDS_${PN}-ptest = "util-linux-getopt bash" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb index 8430b7e10..6d53f48cd 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb @@ -35,6 +35,7 @@ do_install_ptest() { sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh } +RDEPENDS_${PN} += "bash" RDEPENDS_${PN}-ptest = "util-linux-getopt bash" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 7faf0cabb..86aae3340 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -34,7 +34,7 @@ ARMPATCHES_arm = "file://klibc-config-eabi.patch \ S = "${WORKDIR}/git" OPTFLAGS = "${TUNE_CCARGS} -Os" -OPTFLAGS_append_libc-musl_toolchain-clang = " -fno-builtin-bcmp" +OPTFLAGS_append_toolchain-clang = " -fno-builtin-bcmp" PARALLEL_MAKE = "" EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb index 5ab9a3fb4..e0b04c110 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb @@ -224,4 +224,4 @@ FILES_${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" FILES_${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-utils = "${PN}" +RDEPENDS_${PN}-utils = "${PN} perl" diff --git a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 2c0914d30..09e738488 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -31,7 +31,11 @@ RDEPENDS_${PN}_aarch64 = "dmidecode" RDEPENDS_${PN}_powerpc = "dmidecode" RDEPENDS_${PN}_powerpc64 = "dmidecode" RDEPENDS_${PN}_append = " \ - perl-module-file-basename perl-module-file-find perl-module-getopt-long perl-module-posix \ + perl \ + perl-module-file-basename \ + perl-module-file-find \ + perl-module-getopt-long \ + perl-module-posix \ perl-module-overload \ perl-module-overloading \ perl-module-file-glob \ 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 index b4fcfe3ed..585dc9481 100644 --- 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 @@ -144,7 +144,7 @@ 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" +RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol bash" # isadump and isaset helper program files FILES_${PN}-isatools = "${sbindir}/isa*" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb b/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb index 2b4448a22..efa3467a7 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb @@ -11,7 +11,7 @@ These tools are used at runtime." inherit packagegroup -RDEPENDS_bluez5 = " \ +RDEPENDS_${PN} = " \ bluez5-noinst-tools \ bluez5-obex \ bluez5-testtools \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb deleted file mode 100644 index 01c6e3781..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Telepathy Framework glib-base helper library" -DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus hostpython-runtime-native dbus-native dbus-glib libxslt-native" -LICENSE = "LGPLv2.1+" - -SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BP}.tar.gz" -SRC_URI[md5sum] = "93c429e37750b25dcf8de86bb514664f" -SRC_URI[sha256sum] = "ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf" - -LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" - -inherit autotools pkgconfig gettext gobject-introspection - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb new file mode 100644 index 000000000..2b05c61a0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Telepathy Framework glib-base helper library" +DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus hostpython-runtime-native dbus-native dbus-glib libxslt-native" +LICENSE = "LGPLv2.1+" + +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BP}.tar.gz" +SRC_URI[md5sum] = "cbeb0a24acc26e7f095be281c324da69" +SRC_URI[sha256sum] = "9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb" + +LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" + +inherit autotools pkgconfig gettext gobject-introspection vala + +EXTRA_OECONF = "--enable-vala-bindings" + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index e891868cd..a8367b5d9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -14,25 +14,26 @@ inherit distutils3-base S = "${WORKDIR}/git" do_install_append() { - install -d ${D}${datadir}/dnf - install -m 0755 ${S}/samples/* ${D}${datadir}/dnf - install -d ${D}${PYTHON_SITEPACKAGES_DIR}/dnf-plugins/mkimg - install -m 0755 ${S}/dnf-plugins/mkimg/* ${D}${PYTHON_SITEPACKAGES_DIR}/dnf-plugins/mkimg - for file in $(ls ${S}/dnf-plugins/ | grep -v mkimg); do - install -m 0755 ${S}/dnf-plugins/$file ${D}${PYTHON_SITEPACKAGES_DIR}/dnf-plugins - done + install -d ${D}${datadir}/dnf + install -m 0755 ${S}/samples/* ${D}${datadir}/dnf + install -d ${D}${PYTHON_SITEPACKAGES_DIR}/dnf-plugins/mkimg + install -m 0755 ${S}/dnf-plugins/mkimg/* ${D}${PYTHON_SITEPACKAGES_DIR}/dnf-plugins/mkimg + for file in $(ls ${S}/dnf-plugins/ | grep -v mkimg); do + install -m 0755 ${S}/dnf-plugins/$file ${D}${PYTHON_SITEPACKAGES_DIR}/dnf-plugins + done } do_install_append_class-target() { - install -d ${D}${sysconfdir}/yum.repos.d - install -m 0644 ${WORKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d + install -d ${D}${sysconfdir}/yum.repos.d + install -m 0644 ${WORKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d } FILES_${PN} += "${datadir}/dnf" RDEPENDS_${PN} += " \ - dnf \ - libnewt-python \ - " + bash \ + dnf \ + libnewt-python \ +" BBCLASSEXTEND = "nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb index e259c45be..d464e9d8a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb @@ -100,7 +100,7 @@ do_install_append_class-target() { PACKAGES =+ "${PN}-npm" FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" -RDEPENDS_${PN}-npm = "bash python python-shell python-datetime python-subprocess python-textutils \ +RDEPENDS_${PN}-npm = "bash python-core python-shell python-datetime python-subprocess python-textutils \ python-compiler python-misc python-multiprocessing" PACKAGES =+ "${PN}-systemtap" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb index 91f94a1aa..7532b3fa2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb @@ -28,6 +28,7 @@ do_install_prepend() { } RDEPENDS_${PN}_class-target = " \ + perl \ perl-module-carp \ perl-module-exporter \ perl-module-exporter-heavy \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index 785c2f5ac..4c0617c49 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -47,7 +47,7 @@ EXTRA_OECONF = "--enable-mbstring \ --enable-fpm \ --with-libdir=${baselib} \ --with-gettext=${STAGING_LIBDIR}/.. \ - --with-libzip=${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} \ @@ -69,6 +69,8 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ " PACKAGECONFIG_class-native = "" +PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" + PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb index 1f1e80ce8..77c995b57 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb @@ -41,6 +41,7 @@ EXTRA_OECONF += "\ PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" RDEPENDS_${PN} += " \ + python \ python-syslog \ python-pprint \ python-compression \ diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb index 94643cd24..b01d7f64e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb @@ -24,4 +24,4 @@ do_install_append() { RDEPENDS_${PN} = "python-curses python-textutils \ python-codecs python-ctypes python-pprint \ - python-shell python-subprocess" + python-shell python-subprocess python-core" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb index 26664255d..eaf6b9b43 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb @@ -22,7 +22,7 @@ inherit cmake pkgconfig # Put client tools into a separate package PACKAGE_BEFORE_PN += "${PN}-tools" FILES_${PN}-tools = "${bindir}" -RDEPENDS_${PN}-tools = "python3-${BPN}" +RDEPENDS_${PN}-tools = "python3-${BPN} python3-core" # Create the wrapper for python3 PACKAGES += "python3-${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index 77d3cfeef..b922bb1f1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -43,5 +43,5 @@ FILES_${PN}-diskmon = "${sbindir}/sgdiskmon ${sysconfdir}/init.d/sgdisk" FILES_${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid" RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-diskmon += "${PN}" -RDEPENDS_${PN}-raidmon += "${PN}" +RDEPENDS_${PN}-diskmon += "${PN} bash" +RDEPENDS_${PN}-raidmon += "${PN} bash" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.22.3.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.22.3.bb deleted file mode 100644 index 55ee27760..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.22.3.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "GTK+2 standard themes" -HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome" - -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -inherit autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even distro_features_check - -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -DEPENDS += "intltool-native gtk+" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - " - -SRC_URI[md5sum] = "b51c362b157b6407303d44f93c31ee11" -SRC_URI[sha256sum] = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a" - -EXTRA_OECONF = "--disable-gtk3-engine" - -do_install_append() { - # Only building Adwaita, remove highcontrast files - rm -rf ${D}${prefix}/share/themes/HighContrast \ - ${D}${prefix}/share/icons - - # The libtool archive file is unneeded with shared libs on modern Linux - rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la -} - -# There could be gnome-theme-highcontrast as well but that requires -# gtk+3 and includes lots of icons (is also broken with B != S). -PACKAGES += "gnome-theme-adwaita \ - gnome-theme-adwaita-dark \ - " - -FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ - ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" - -FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" -RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita" - -# gnome-themes-standard is empty and doesn't exist -RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb new file mode 100644 index 000000000..53eb32be9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb @@ -0,0 +1,45 @@ +SUMMARY = "GTK+2 standard themes" +HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome" + +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" + +# Upstream renamed this package to gnome-themes-extra at some point +BPN = "gnome-themes-extra" + +inherit gnomebase gettext gtk-icon-cache upstream-version-is-even distro_features_check + +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +DEPENDS += "intltool-native gtk+" + +SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" +SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" + +EXTRA_OECONF = "--disable-gtk3-engine" + +do_install_append() { + # Only building Adwaita, remove highcontrast files + rm -rf ${D}${prefix}/share/themes/HighContrast \ + ${D}${prefix}/share/icons + + # The libtool archive file is unneeded with shared libs on modern Linux + rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la +} + +# There could be gnome-theme-highcontrast as well but that requires +# gtk+3 and includes lots of icons (is also broken with B != S). +PACKAGES += "gnome-theme-adwaita \ + gnome-theme-adwaita-dark \ + " + +FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ + ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" + +FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" +RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita" + +# gnome-themes-standard is empty and doesn't exist +RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb index fb9bdc70f..1512a1d7d 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb @@ -50,6 +50,6 @@ python () { #| {standard input}:761: Error: selected processor does not support Thumb mode `smull fp,r2,r3,r9' #| {standard input}:773: Error: selected processor does not support Thumb mode `smull fp,r3,r5,r8' #| make[2]: *** [celt/celt.lo] Error 1 -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.8.0.bb index b6a434159..404545d5e 100644 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.8.0.bb @@ -17,3 +17,6 @@ inherit ptest EXTRA_OECMAKE += "-DCLANG_TIDY=OFF" DEPENDS += "boost" + +# cli11 is a header only C++ library, so the main package will be empty. +RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb b/meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb index 501f3bf14..2516fbfca 100644 --- a/meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb +++ b/meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "4cd7bb61b51d41192d1498c1051aa6a4ccd75aeb09b71d2ec706a7084a inherit cpan -RDEPENDS_${PN} = "libmime-types-perl libproc-waitstat-perl msmtp \ +RDEPENDS_${PN} += "libmime-types-perl libproc-waitstat-perl msmtp \ perl-module-filehandle perl-module-mime-base64 perl-module-mime-quotedprint perl-module-posix \ " diff --git a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb index 33707a0af..f57e1224d 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb @@ -21,7 +21,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit cpan -RDEPENDS_${PN} = " perl-module-carp \ +RDEPENDS_${PN} += " perl-module-carp \ perl-module-cwd \ perl-module-dynaloader \ perl-module-extutils-cbuilder \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc index 88786ec67..cd11d9812 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc @@ -8,8 +8,8 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[md5sum] = "3e8035f85cfb2be95207724c59bddfaa" -SRC_URI[sha256sum] = "9d50c99c6388863cbfdc5db9bad62e3a7c2e5fc151554a07c7f3c2530334a34f" +SRC_URI[md5sum] = "531786df7ad98f15c43f1b17edf5f84c" +SRC_URI[sha256sum] = "4249c6ba45587b959292a727532826c5032d59171f923f7f823788f413c2a5a3" PACKAGES =+ "${PYTHON_PN}-bson" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.8.0.bb deleted file mode 100644 index b1778b2f1..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.8.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.9.0.bb new file mode 100644 index 000000000..b1778b2f1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.9.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.8.0.bb deleted file mode 100644 index 5164b186b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.8.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.9.0.bb new file mode 100644 index 000000000..5164b186b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.9.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb index 817ef9baf..fe9d27ab8 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb @@ -30,7 +30,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" inherit setuptools3 python3native -RDEPENDS_${PN} = "python3-pykickstart python3-pyudev \ +RDEPENDS_${PN} += "python3-pykickstart python3-pyudev \ parted python3-pyparted multipath-tools \ lsof cryptsetup libblockdev \ libbytesize \ diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb index ce9bc9280..d54d6223c 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb @@ -160,8 +160,8 @@ python populate_packages_prepend() { elif os.path.exists(themeinfo): themes.append(mod) - do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', allow_dirs=True, prepend=True) - do_split_packages(d, wadir, '^(%s)$' % "|".join(themes), 'webmin-theme-%s', 'Webmin theme for %s', allow_dirs=True, prepend=True) + do_split_packages(d, wadir, '^(%s)$' % "|".join(modules), 'webmin-module-%s', 'Webmin module for %s', extra_depends='perl', allow_dirs=True, prepend=True) + do_split_packages(d, wadir, '^(%s)$' % "|".join(themes), 'webmin-theme-%s', 'Webmin theme for %s', extra_depends='perl', allow_dirs=True, prepend=True) } # Time-savers diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb deleted file mode 100644 index 84d5692ef..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Catfish is a handy file searching tool for linux and unix" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -inherit xfce-app distutils3 gtk-icon-cache - -DEPENDS += "python3-distutils-extra-native" - -B = "${S}" - -SRC_URI[md5sum] = "f4c1c2b2c560824cab8d7f6c7bd624ca" -SRC_URI[sha256sum] = "48caaac872d29e2762e31e59ade1310cb860af55f1a36f2520ce1d90c39227e9" - -FILES_${PN} += "${datadir}/metainfo" - -RDEPENDS_${PN} += "python3-pygobject" diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb new file mode 100644 index 000000000..eec525b88 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb @@ -0,0 +1,17 @@ +SUMMARY = "Catfish is a handy file searching tool for linux and unix" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" + +inherit xfce-app distutils3 gtk-icon-cache + +DEPENDS += "python3-distutils-extra-native" + +B = "${S}" + +SRC_URI[md5sum] = "829824fba33e86d03345bbc718e7b2d9" +SRC_URI[sha256sum] = "29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e" + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "python3-pygobject" diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb deleted file mode 100644 index d122bfe37..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A simple text editor for Xfce" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -# intltool to provide intltool.m4 with AC_PROG_INTLTOOL -# xfce4-dev-tools-native for XDT_I18N macro and more importantly XDT_CHECK_OPTIONAL_PACKAGE -# which fixes mousepad/Makefile.am:72: error: HAVE_DBUS does not appear in AM_CONDITIONAL -DEPENDS = "gtk+ dbus dbus-glib gtksourceview2 intltool-native xfce4-dev-tools-native" - -inherit xfce-app gsettings - -SRC_URI[md5sum] = "fb85c23bcb096a46aee9ec22b4e4fdf5" -SRC_URI[sha256sum] = "39a7379b929d964665299c385b2cf705e32e8760698ccc34f91c990bb733518b" - -# we have no gtksourceview 3.x around -EXTRA_OECONF = "--disable-gtk3" - -FILES_${PN} += "${datadir}/glib-2.0/schemas" diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb new file mode 100644 index 000000000..4bf10a47b --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "A simple text editor for Xfce" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native" + +inherit xfce-app gsettings + +SRC_URI[md5sum] = "98d908842d4a93c35756a67d681c08fe" +SRC_URI[sha256sum] = "84c02adfca7f8b33b9466a306ded72fb9f38f93c9edb78660343854c4a3aded7" + +FILES_${PN} += " \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/polkit-1 \ +" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch deleted file mode 100644 index 5cdc8c728..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2b6bdb860ef53975c7e866f393b61d253c00754d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 22 Jan 2018 15:52:09 +0100 -Subject: [PATCH] Fix build after update of xfconf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -xfconf stopped using dbus-glib so required flags must be included here - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 36a31dc..3dd56bc 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -30,6 +30,7 @@ ristretto_CFLAGS = \ - $(GIO_UNIX_CFLAGS) \ - $(LIBEXIF_CFLAGS) \ - $(XFCONF_CFLAGS) \ -+ $(DBUS_GLIB_CFLAGS) \ - $(EXO_CFLAGS) \ - $(CAIRO_CFLAGS) \ - $(LIBXFCE4UTIL_CFLAGS) \ -@@ -48,6 +49,7 @@ ristretto_LDADD = \ - $(GIO_UNIX_LIBS) \ - $(LIBEXIF_LIBS) \ - $(XFCONF_LIBS) \ -+ $(DBUS_GLIB_LIBS) \ - $(EXO_LIBS) \ - $(CAIRO_LIBS) \ - $(LIBXFCE4UTIL_LIBS) \ --- -2.14.3 - diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb new file mode 100644 index 000000000..9c5bb12e8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Tiny image-viewer" +HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" + +DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file" + +inherit xfce-app + +RRECOMMENDS_${PN} += "tumbler" + +SRC_URI[md5sum] = "4249e14fba78728481d89ce61a8771fc" +SRC_URI[sha256sum] = "16225dd74245eb6e0f82b9c72c6112f161bb8d8b11f3fc77277b7bc3432d4769" + +FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb deleted file mode 100644 index 416ac2adc..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Tiny image-viewer" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" -DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo file" - -inherit xfce-app - -RRECOMMENDS_${PN} += "tumbler" - -SRC_URI[md5sum] = "0142c8b9c492cf447e563b00c6204359" -SRC_URI[sha256sum] = "3a0be4526c93ec0ebbf2e63e69dd0c98f16b20b863d3b6426272592e5b00cea2" -SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch" - -FILES_${PN} += "${datadir}/appdata" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb deleted file mode 100644 index 426282e14..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Terminal emulator for the Xfce desktop environment" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" - -inherit xfce-app - -FILES_${PN} += "${datadir}/xfce4 \ - ${datadir}/gnome-control-center" - -SRC_URI[md5sum] = "c861540dd1dd05f56e62382b3851cf66" -SRC_URI[sha256sum] = "a88f98af4da72394f2cfbd7f14b0f053ec0a3b58a4f6a577836357c60a6c42ab" - -RRECOMMENDS_${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.8.bb new file mode 100644 index 000000000..ebc046b78 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.8.bb @@ -0,0 +1,14 @@ +SUMMARY = "Terminal emulator for the Xfce desktop environment" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" + +inherit xfce-app + +FILES_${PN} += "${datadir}/xfce4 \ + ${datadir}/gnome-control-center" + +SRC_URI[md5sum] = "4295d4d783f6d6dfe92f5bb15d96f6c6" +SRC_URI[sha256sum] = "8fba6a60d3a0fee07417ad7c36bf78cc45be1b27f0759e125051aa73f08487fd" + +RRECOMMENDS_${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb deleted file mode 100644 index a286a5adb..000000000 --- a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Parole is a modern simple media player based on the GStreamer framework" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/parole" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-app gtk-doc mime - -DEPENDS += " \ - glib-2.0 \ - dbus-glib \ - gtk+3 \ - \ - xfce4-dev-tools-native \ - libxfce4util \ - libxfce4ui \ - xfconf \ - \ - gstreamer1.0-plugins-base \ - taglib \ -" - -SRC_URI[md5sum] = "cd22ab579470c5728db0aa6c0b9d4c7d" -SRC_URI[sha256sum] = "bff0fc846d0d7b8f435ac5514976f1cd1d82b62dbf1b7d470e253a5b439407da" - -RDEPENDS_${PN} += "gstreamer1.0-plugins-good" - -EXTRA_OECONF = "--disable-gtk-doc" - -PACKAGECONFIG ??= "notify" -PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" -PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" - -FILES_${PN} += " \ - ${datadir}/appdata \ - ${libdir}/parole-0/*.so \ -" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.4.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.4.bb new file mode 100644 index 000000000..68556a2ab --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.4.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Parole is a modern simple media player based on the GStreamer framework" +HOMEPAGE = "https://docs.xfce.org/apps/parole/start" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-app gtk-doc mime + +DEPENDS += " \ + dbus-glib \ + xfce4-dev-tools-native \ + libxfce4util \ + libxfce4ui \ + xfconf \ + \ + gstreamer1.0-plugins-base \ + taglib \ +" + +SRC_URI[md5sum] = "c23621eb44df292f828e86074d4e719d" +SRC_URI[sha256sum] = "e92b8ec369e53d921b47d2473c2e2a1e9e04d3c5d536d419abdff40e5e136dc1" + +RDEPENDS_${PN} += "gstreamer1.0-plugins-good" + +EXTRA_OECONF = "--disable-gtk-doc" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" +PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${libdir}/parole-0/*.so \ +" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb deleted file mode 100644 index 869435d68..000000000 --- a/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Music Player Daemon (MPD) client written in GTK+" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfmpc" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ libxfce4util libxfce4ui libmpd vala-native" - -# While this item does not require it, it depends on mpd which does -LICENSE_FLAGS = "commercial" - -# for now we recommend our own mpd-server -RRECOMMENDS_${PN} = "mpd" - -inherit xfce-app - -SRC_URI[md5sum] = "e2d2faeb7a6f62813e287f3d12522b71" -SRC_URI[sha256sum] = "4189c0c82b66b758a6d5bc651493b675d3d46329e5f1a76ff26c448125f4fcb0" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb new file mode 100644 index 000000000..0f5ed8957 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Music Player Daemon (MPD) client written in GTK+" +HOMEPAGE = "https://goodies.xfce.org/projects/applications/xfmpc" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "libxfce4util libxfce4ui libmpd vala-native" + +# While this item does not require it, it depends on mpd which does +LICENSE_FLAGS = "commercial" + +# for now we recommend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +inherit xfce-app + +SRC_URI[md5sum] = "e6ff8563f159d1e727d656fb88964998" +SRC_URI[sha256sum] = "c76e2a88dc3e1d345da7a5c68fa39981494c2b40033748efcac54411c9e65689" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb deleted file mode 100644 index 83e2bb5c0..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin with graphical representation of the cpu frequency" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "f0ebfabb273adf69361b37a3fa4b7912" -SRC_URI[sha256sum] = "85da0ec89aacfd31e0bbafcefea37cdca618d62e681c1c9da8bdd492f028f4c7" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb new file mode 100644 index 000000000..eeb54b315 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "48ead9dcc019212795637c170d9e2ca2" +SRC_URI[sha256sum] = "3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb deleted file mode 100644 index 97aa184b0..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "c42149ec71836fe83085511429e638dc" -SRC_URI[sha256sum] = "e0c7321346ded2539c4688c593f650696ed0ddca0a5f9d4e404d0e7fc42ae256" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb new file mode 100644 index 000000000..a1fc139bb --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "b88e47af4e9e156e43dc993f18218bd3" +SRC_URI[sha256sum] = "cd358bc2ff0707b8ef1504396a19b0a27f802c2ec7bceb5cebe2c7baf6adebd4" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb deleted file mode 100644 index 698152bae..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Menu for quick access to folders, documents and removable media" -DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents and removable media" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "e3a306d927befb8afcb5212f8ab0b8c9" -SRC_URI[sha256sum] = "7ba3f46f88c2845cbf413efeefaed29157f8b98571856c6e2bf35e4de5d8ecce" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb new file mode 100644 index 000000000..c88e8439e --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "Menu for quick access to folders, documents and removable media" +DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents and removable media" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "bde92cbd08f129d517524784e5060816" +SRC_URI[sha256sum] = "f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb deleted file mode 100644 index 63da1e09e..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Pulseaudio mixer for the xfce panel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f5eac6bb0d6ec0dc655e417781d4015f" - -inherit xfce-panel-plugin distro_features_check - -REQUIRED_DISTRO_FEATURES = "pulseaudio x11" - -DEPENDS += "dbus-glib pulseaudio" - -SRC_URI[md5sum] = "7df7280c19c2c8b8c5bc4f4f2136d1dd" -SRC_URI[sha256sum] = "6ca88314dbac3e24c0e1bfc593fad6edb66319766be62e8256c81b0314f049f0" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" - -RRECOMMENDS_${PN} = "pavucontrol" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb new file mode 100644 index 000000000..8b8f5f21c --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Pulseaudio mixer for the xfce panel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=f5eac6bb0d6ec0dc655e417781d4015f" + +inherit xfce-panel-plugin distro_features_check + +REQUIRED_DISTRO_FEATURES = "pulseaudio x11" + +DEPENDS += "dbus-glib pulseaudio" + +SRC_URI[md5sum] = "9a34eadf06ed217ec0732a096f178987" +SRC_URI[sha256sum] = "4ae8aebc2458675d4f885bf16f73829be359e16370a684301bbef6a23758a120" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" + +RRECOMMENDS_${PN} = "pavucontrol" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.2.bb deleted file mode 100644 index 230a24faf..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "An alternate menu for the Xfce desktop environment" -HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin cmake - -SRC_URI[md5sum] = "e9aa6c33463bd564c47e1943c0fc7ac3" -SRC_URI[sha256sum] = "f1bf6be37f7778a486b16ef115d4c05120cc12c87e4af3af9c5001276bdcb7cc" - -RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb new file mode 100644 index 000000000..a05f0dc6f --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb @@ -0,0 +1,11 @@ +SUMMARY = "An alternate menu for the Xfce desktop environment" +HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin cmake + +SRC_URI[md5sum] = "21f1e1d8d4a030f23d358d6c5ac50f2a" +SRC_URI[sha256sum] = "e0c6cc4fc1e685bc9601ec217a803d5489ca3276f4008bf056600471c6ac1848" + +RRECOMMENDS_${PN} += "menulibre" -- cgit v1.2.3 From 665fd026517259031fd55bcfb2a9dab0d9f3582a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 26 Aug 2019 01:32:28 -0400 Subject: meta-openembedded: subtree update:509d40153d..1e8bc46e55 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (5): networkmanager: musl now supports secure_getenv libuser: musl now supports secure_getenv libgit2: Upgrade 0.27.8 -> 0.27.9 poppler: Stop using USE_FIXEDPOINT networkmanager: Upgrade 1.18.0 -> 1.18.2 Andreas Müller (10): xfce4-time-out-plugin: upgrade 1.0.2 -> 1.0.3 xfce4-battery-plugin: 1.1.2 -> 1.1.3 xfce4-smartbookmark-plugin: upgrade 0.5.0 -> 0.5.1 xfce4-wavelan-plugin: upgrade 0.6.0 -> 0.6.1 xfce4-netload-plugin: upgrade 1.3.1 -> 1.3.2 xfce4-systemload-plugin: upgrade 1.2.2 -> 1.2.3 xfce4-mpc-plugin: upgrade 0.5.1 -> 0.5.2 xfce4-fsguard-plugin: upgrade 1.1.0 -> 1.1.1 xfce4-diskperf-plugin: upgrade 2.6.1 -> 2.6.2 gigolo: upgrade 0.4.2 -> 0.5.0 Anuj Mittal (2): clinfo: add recipe ade: add recipe Hongxu Jia (1): lvm2: fix circular dependencies while systemd enable cryptsetup Jan Kaisrlik (1): networkd-dispatcher: service file is using different location of binary Johannes Pointner (1): libtinyxml2: update to 7.1.0 Martin Jansa (1): python-socketio: prevent python2 socketio depending on python3-aiohttp Piotr Tworek (3): libgee: Update to version 0.20.2 gnome-bluetooth: Update to version 3.32.1. gnome-keyring: Update to version 3.28.2 Yi Zhao (1): apache2: upgrade 2.4.39 -> 2.4.41 Yuan Chao (5): libnftnl: upgrade 1.1.3 -> 1.1.4 libtdb: upgrade 1.4.0 -> 1.4.1 python-flask-pymongo: upgrade 0.5.1 -> 2.3.0 xfsprogs: upgrade 5.2.0 -> 5.2.1 python-protobuf: upgrade 3.9.0 -> 3.9.1 Zang Ruochen (1): cryptsetup: upgrade 2.1.0 -> 2.2.0. Change-Id: I4db480893fc3b39cc7e014dbca0adc9c5317abf1 Signed-off-by: Brad Bishop --- .../recipes-utils/xfsprogs/xfsprogs_5.2.0.bb | 73 ------- .../recipes-utils/xfsprogs/xfsprogs_5.2.1.bb | 73 +++++++ .../gnome-bluetooth/gnome-bluetooth_3.18.2.bb | 19 -- .../gnome-bluetooth/gnome-bluetooth_3.32.1.bb | 22 +++ .../gnome-keyring/gnome-keyring_3.20.0.bb | 42 ---- .../gnome-keyring/gnome-keyring_3.28.2.bb | 44 +++++ .../libuser/libuser/0001-Check-for-issetugid.patch | 62 ------ .../recipes-support/libuser/libuser_0.62.bb | 1 - .../networkmanager/networkmanager_1.18.0.bb | 156 --------------- .../networkmanager/networkmanager_1.18.2.bb | 146 ++++++++++++++ .../networkd-dispatcher_2.0.1.bb | 2 +- ...ng-local-function-as-one-of-printf-family.patch | 54 ++++-- .../recipes-filter/libnftnl/libnftnl_1.1.3.bb | 15 -- .../recipes-filter/libnftnl/libnftnl_1.1.4.bb | 15 ++ .../recipes-support/libtdb/libtdb_1.4.0.bb | 57 ------ .../recipes-support/libtdb/libtdb_1.4.1.bb | 57 ++++++ .../recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb | 88 --------- .../recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb | 88 +++++++++ .../recipes-devtools/libgee/libgee_0.20.1.bb | 24 --- .../recipes-devtools/libgee/libgee_0.20.2.bb | 22 +++ .../recipes-support/libgit2/libgit2_0.27.8.bb | 25 --- .../recipes-support/libgit2/libgit2_0.27.9.bb | 24 +++ .../libtinyxml2/libtinyxml2_7.0.1.bb | 15 -- .../libtinyxml2/libtinyxml2_7.1.0.bb | 15 ++ .../meta-oe/recipes-support/lvm2/lvm2.inc | 4 +- .../meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb | 6 + .../recipes-support/opencl/clinfo_2.2.18.04.06.bb | 20 ++ .../meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 21 ++ ...Dev.cc-fix-build-error-when-using-fixedpo.patch | 100 ---------- .../recipes-support/poppler/poppler_0.79.0.bb | 9 - .../python/python-flask-pymongo.inc | 6 +- .../python/python-flask-pymongo_0.5.1.bb | 2 - .../python/python-flask-pymongo_2.3.0.bb | 2 + .../recipes-devtools/python/python-protobuf.inc | 4 +- .../python/python-protobuf_3.9.0.bb | 2 - .../python/python-protobuf_3.9.1.bb | 2 + .../recipes-devtools/python/python-socketio.inc | 6 +- .../python/python3-flask-pymongo_0.5.1.bb | 2 - .../python/python3-flask-pymongo_2.3.0.bb | 2 + .../python/python3-protobuf_3.9.0.bb | 10 - .../python/python3-protobuf_3.9.1.bb | 10 + .../python/python3-socketio_4.3.1.bb | 2 + .../recipes-httpd/apache2/apache2_2.4.39.bb | 215 --------------------- .../recipes-httpd/apache2/apache2_2.4.41.bb | 215 +++++++++++++++++++++ .../meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb | 11 -- .../meta-xfce/recipes-apps/gigolo/gigolo_0.5.0.bb | 11 ++ .../xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.1.bb | 18 -- .../xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb | 18 ++ .../battery/xfce4-battery-plugin_1.1.2.bb | 9 - .../battery/xfce4-battery-plugin_1.1.3.bb | 9 + ...n-Include-sys-sysmacros.h-for-major-minor.patch | 30 --- .../diskperf/xfce4-diskperf-plugin_2.6.1.bb | 12 -- .../diskperf/xfce4-diskperf-plugin_2.6.2.bb | 10 + .../fsguard/xfce4-fsguard-plugin_1.1.0.bb | 9 - .../fsguard/xfce4-fsguard-plugin_1.1.1.bb | 9 + ...ude-sys-sysctl.h-its-unused-on-linux-port.patch | 25 --- .../netload/xfce4-netload-plugin_1.3.1.bb | 12 -- .../netload/xfce4-netload-plugin_1.3.2.bb | 10 + .../xfce4-smartbookmark-plugin_0.5.0.bb | 9 - .../xfce4-smartbookmark-plugin_0.5.1.bb | 9 + .../systemload/xfce4-systemload-plugin_1.2.2.bb | 11 -- .../systemload/xfce4-systemload-plugin_1.2.3.bb | 11 ++ .../time-out/xfce4-time-out-plugin_1.0.2.bb | 10 - .../time-out/xfce4-time-out-plugin_1.0.3.bb | 10 + .../wavelan/xfce4-wavelan-plugin_0.6.0.bb | 9 - .../wavelan/xfce4-wavelan-plugin_0.6.1.bb | 9 + 66 files changed, 943 insertions(+), 1107 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_2.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.1.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb deleted file mode 100644 index 10d1b70d5..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "XFS Filesystem Utilities" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2 & LGPLv2.1" -LICENSE_libhandle = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ - file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" -DEPENDS = "util-linux util-linux-native" -SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ - file://remove_flags_from_build_flags.patch \ - file://0001-build-Check-for-sync_file_range-libc-function.patch \ - file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ - file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ - " -SRC_URI[md5sum] = "e38032818aa3b1ef224a69b6184fc12a" -SRC_URI[sha256sum] = "e41cdaa43d92b38c8a12ce9cb612ab911ba0e019c2e0762c494a8a601f533fd6" - -inherit autotools-brokensep - -PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" - -DEPENDS += "util-linux" - -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" - -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" -FILES_${PN}-repair = "${base_sbindir}/xfs_repair" - -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" - -EXTRA_OECONF = "--enable-gettext=no \ - --enable-scrub=no \ - INSTALL_USER=root \ - INSTALL_GROUP=root \ - ac_cv_header_aio_h=yes \ - ac_cv_lib_rt_lio_listio=yes \ -" - -DISABLE_STATIC = "" -EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" - -PACKAGECONFIG ??= "readline blkid" - -PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" -PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" - -export DEBUG="-DNDEBUG" -export BUILD_VERBOSE="1" -export tagname="CC" - -EXTRA_OEMAKE = "DIST_ROOT='${D}'" - -do_configure () { - export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure - # Recreate configure script. - oe_runmake configure - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} - -do_install_append() { - oe_runmake 'DESTDIR=${D}' install-dev - rm ${D}${libdir}/*.la - rmdir --ignore-fail-on-non-empty ${D}${libdir} - - ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a - ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so -} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb new file mode 100644 index 000000000..bed80a615 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb @@ -0,0 +1,73 @@ +SUMMARY = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2 & LGPLv2.1" +LICENSE_libhandle = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" +DEPENDS = "util-linux util-linux-native" +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ + file://remove_flags_from_build_flags.patch \ + file://0001-build-Check-for-sync_file_range-libc-function.patch \ + file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ + file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ + " +SRC_URI[md5sum] = "5ca3f79e76e3fb984a03d1b42a2e60ba" +SRC_URI[sha256sum] = "7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae" + +inherit autotools-brokensep + +PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" + +DEPENDS += "util-linux" + +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" + +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" +FILES_${PN}-repair = "${base_sbindir}/xfs_repair" + +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" + +EXTRA_OECONF = "--enable-gettext=no \ + --enable-scrub=no \ + INSTALL_USER=root \ + INSTALL_GROUP=root \ + ac_cv_header_aio_h=yes \ + ac_cv_lib_rt_lio_listio=yes \ +" + +DISABLE_STATIC = "" +EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" + +PACKAGECONFIG ??= "readline blkid" + +PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" +PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" + +export DEBUG="-DNDEBUG" +export BUILD_VERBOSE="1" +export tagname="CC" + +EXTRA_OEMAKE = "DIST_ROOT='${D}'" + +do_configure () { + export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure + # Recreate configure script. + oe_runmake configure + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} + +do_install_append() { + oe_runmake 'DESTDIR=${D}' install-dev + rm ${D}${libdir}/*.la + rmdir --ignore-fail-on-non-empty ${D}${libdir} + + ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a + ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb deleted file mode 100644 index d0eebda38..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -SECTION = "x11/gnome" - -DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native gnome-common-native \ - bluez5 \ -" - -inherit gnomebase gtk-icon-cache gobject-introspection distro_features_check -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "75d09c924468ec0c687f9ab3acf7f113" -SRC_URI[archive.sha256sum] = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398" - -FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb new file mode 100644 index 000000000..3c4438e7e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even + +# gtk-icon-cache bbclass will take care of this for us. +EXTRA_OEMESON = "-Dicon_update=false" + +SRC_URI[archive.md5sum] = "5b3d66f564a5067ea154750cdb6d850d" +SRC_URI[archive.sha256sum] = "6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa" + +RDEPENDS_${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb deleted file mode 100644 index 55640625d..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Password and keyring managing daemon" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome" - -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit distro_features_check gnomebase remove-libtool - -DEPENDS = " \ - intltool-native \ - glib-2.0-native \ - gtk+3 \ - gcr \ - libgcrypt \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ -" - -SRC_URI[archive.md5sum] = "e09efe8021944dae404736b5a2adb98e" -SRC_URI[archive.sha256sum] = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99" -SRC_URI += "file://musl.patch" - -REQUIRED_DISTRO_FEATURES = "x11" - -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" - -EXTRA_OECONF = " \ - --disable-doc \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \ -" - - -FILES_${PN} += " \ - ${datadir}/dbus-1/services \ - ${datadir}/p11-kit \ - ${base_libdir}/security/*${SOLIBSDEV} \ - ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb new file mode 100644 index 000000000..8dc11c85d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb @@ -0,0 +1,44 @@ +SUMMARY = "Password and keyring managing daemon" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome" + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit distro_features_check gnomebase remove-libtool gettext upstream-version-is-even + +DEPENDS = " \ + intltool-native \ + glib-2.0-native \ + gtk+3 \ + gcr \ + libgcrypt \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ +" + +SRC_URI[archive.md5sum] = "284580f954f762caf62aed2ae7358177" +SRC_URI[archive.sha256sum] = "81171b7d07211b216b4c9bb79bf2deb3deca18fe8d56d46dda1c4549b4a2646a" +SRC_URI += "file://musl.patch" + +REQUIRED_DISTRO_FEATURES = "x11" + +RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" + +EXTRA_OECONF = "--disable-doc \ + ac_cv_path_SSH_AGENT=${bindir}/ssh-agent \ + ac_cv_path_SSH_ADD=${bindir}/ssh-add" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--enable-pam --with-pam-dir=${base_libdir}/security, --disable-pam" +PACKAGECONFIG[ssh-agent] = "--enable-ssh-agent,--disable-ssh-agent,,openssh-misc" + +FILES_${PN} += " \ + ${datadir}/dbus-1/services \ + ${datadir}/p11-kit \ + ${base_libdir}/security/*${SOLIBSDEV} \ + ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ +" diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch deleted file mode 100644 index 79756b9a0..000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d0537cb7f2dc5877700ad78dfd191515379d4edc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 02:22:51 +0000 -Subject: [PATCH 1/2] Check for issetugid() - -If secure version of getenv is not there then we can use -issetugid() as aid to call getenv() - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - configure.ac | 1 + - lib/config.c | 12 +++++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1ded1a2..ee19e1f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,6 +125,7 @@ AC_TYPE_OFF_T - AC_TYPE_SIZE_T - - AC_CHECK_FUNCS([__secure_getenv secure_getenv]) -+AC_CHECK_FUNCS([issetugid]) - - # Modify CFLAGS after all tests are run (some of them could fail because - # of the -Werror). -diff --git a/lib/config.c b/lib/config.c -index 29e7120..30f9daf 100644 ---- a/lib/config.c -+++ b/lib/config.c -@@ -44,8 +44,10 @@ - # define safe_getenv(string) secure_getenv(string) - #elif defined(HAVE___SECURE_GETENV) - # define safe_getenv(string) __secure_getenv(string) -+#elif defined(HAVE_ISSETUGID) -+# define safe_getenv(string) safe_getenv_issetugid(string) - #else --# error Neither secure_getenv not __secure_getenv are available -+# error None of secure_getenv, __secure_getenv, or issetugid is available - #endif - - struct config_config { -@@ -59,6 +61,14 @@ struct config_key { - GList *values; - }; - -+static const char* -+safe_getenv_issetugid(const char* name) -+{ -+ if (issetugid ()) -+ return 0; -+ return getenv (name); -+} -+ - /* Compare two section names */ - static int - compare_section_names(gconstpointer a, gconstpointer b) --- -2.7.0 - diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb index 7ec54eb16..74053e451 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SECTION = "base" SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ - file://0001-Check-for-issetugid.patch \ file://0002-remove-unused-execinfo.h.patch \ file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb deleted file mode 100644 index 58968dfb0..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb +++ /dev/null @@ -1,156 +0,0 @@ -SUMMARY = "NetworkManager" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=233931303ef80eded167add1f60a50c1 \ -" - -DEPENDS = " \ - intltool-native \ - libxslt-native \ - libnl \ - libgudev \ - util-linux \ - libndp \ - libnewt \ - jansson \ - curl \ -" - -inherit gnomebase gettext systemd bash-completion vala gobject-introspection gtk-doc update-alternatives - -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ - file://0002-Do-not-create-settings-settings-property-documentati.patch \ -" -SRC_URI_append_libc-musl = " \ - file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ - file://musl/0002-Fix-build-with-musl.patch \ -" -SRC_URI[md5sum] = "c8c27116a8083bab5d5fcca0d03e988a" -SRC_URI[sha256sum] = "c6e8df25e5a3c7309bc17664be8971689314884cdd08afdd6b0847d29d2a8ba6" - -UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.16/" -UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P1\.10(\.\d+)+).tar.xz" - -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ - --with-nmtui=yes \ - --with-udev-dir=${nonarch_base_libdir}/udev \ -" - -# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template -# avoids: -# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? -# -# and -# -# | In file included from ../NetworkManager-1.16.0/src/systemd/nm-sd-utils-core.c:25: -# | ../NetworkManager-1.16.0/src/systemd/sd-adapt-core/nm-sd-adapt-core.h:68:6: error: #error neither secure_getenv nor __secure_getenv is available -# | # error neither secure_getenv nor __secure_getenv is available -# | ^~~~~ -CFLAGS_append_libc-musl = " \ - -DRTLD_DEEPBIND=0 \ - -DHAVE_SECURE_GETENV \ - -Dsecure_getenv=getenv \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" -} - -PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ -" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ - --without-systemdsystemunitdir, \ -" -PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -# Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" - -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl \ -" - -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" - -FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/NetworkManager/${PV}/*.so \ - ${nonarch_libdir}/NetworkManager/VPN \ - ${nonarch_libdir}/NetworkManager/conf.d \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${nonarch_base_libdir}/udev/* \ - ${systemd_unitdir}/system \ - ${libdir}/pppd \ -" - -RRECOMMENDS_${PN} += "iptables \ - ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ -" -RCONFLICTS_${PN} = "connman" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ - ${libdir}/NetworkManager/${PV}/*.la \ -" - -FILES_${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES_${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" -ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" -ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" - -do_install_append() { - rm -rf ${D}/run ${D}${localstatedir}/run - - # For read-only filesystem, do not create links during bootup - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager - fi -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb new file mode 100644 index 000000000..b760a40c3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb @@ -0,0 +1,146 @@ +SUMMARY = "NetworkManager" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ + file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ +" + +DEPENDS = " \ + intltool-native \ + libxslt-native \ + libnl \ + libgudev \ + util-linux \ + libndp \ + libnewt \ + jansson \ + curl \ +" + +inherit gnomebase gettext systemd bash-completion vala gobject-introspection gtk-doc update-alternatives + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ + file://0002-Do-not-create-settings-settings-property-documentati.patch \ +" +SRC_URI_append_libc-musl = " \ + file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ + file://musl/0002-Fix-build-with-musl.patch \ +" +SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9" +SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3" + +UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.16/" +UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P1\.10(\.\d+)+).tar.xz" + +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ + --with-nmtui=yes \ + --with-udev-dir=${nonarch_base_libdir}/udev \ +" + +# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template +# avoids: +# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? +CFLAGS_append_libc-musl = " \ + -DRTLD_DEEPBIND=0 \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" +} + +PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ +" +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ + --without-systemdsystemunitdir, \ +" +PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" +# Use full featured dhcp client instead of internal one +PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" +PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" + +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-adsl \ +" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm-glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/NetworkManager/${PV}/*.so \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/conf.d \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${nonarch_base_libdir}/udev/* \ + ${systemd_unitdir}/system \ + ${libdir}/pppd \ +" + +RRECOMMENDS_${PN} += "iptables \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ +" +RCONFLICTS_${PN} = "connman" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ + ${libdir}/NetworkManager/${PV}/*.la \ +" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" +ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" +ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" + +do_install_append() { + rm -rf ${D}/run ${D}${localstatedir}/run + + # For read-only filesystem, do not create links during bootup + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager + fi +} diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb index affd0aae0..008a7ac9a 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb @@ -24,7 +24,7 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - install -D -m 0755 ${S}/networkd-dispatcher ${D}${sbindir}/networkd-dispatcher + install -D -m 0755 ${S}/networkd-dispatcher ${D}${bindir}/networkd-dispatcher install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf } diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch index 561f0e554..e64091b50 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch @@ -1,6 +1,6 @@ -From 9e2c810ebc3c917ea7483205178416e9eaf952fe Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Wed, 7 Nov 2018 19:41:54 +0000 +From 373e13e28e34b4d415fc096e1c7175f4ecfbf0da Mon Sep 17 00:00:00 2001 +From: Yuan Chao +Date: Wed, 21 Aug 2019 11:18:56 +0900 Subject: [PATCH] avoid naming local function as one of printf family Fixes build issues with clang @@ -8,6 +8,8 @@ error: no member named '__builtin___snprintf_chk' in 'struct expr_ops' Signed-off-by: Khem Raj Signed-off-by: Alex Kiernan + +Signed-off-by: Yuan Chao --- include/expr_ops.h | 2 +- include/obj.h | 2 +- @@ -44,11 +46,13 @@ Signed-off-by: Alex Kiernan src/expr/reject.c | 2 +- src/expr/rt.c | 2 +- src/expr/socket.c | 2 +- + src/expr/synproxy.c | 2 +- src/expr/target.c | 2 +- src/expr/tproxy.c | 2 +- src/expr/tunnel.c | 2 +- src/expr/xfrm.c | 2 +- src/obj/counter.c | 2 +- + src/obj/ct_expect.c | 2 +- src/obj/ct_helper.c | 2 +- src/obj/ct_timeout.c | 2 +- src/obj/limit.c | 2 +- @@ -56,7 +60,7 @@ Signed-off-by: Alex Kiernan src/obj/secmark.c | 2 +- src/obj/tunnel.c | 2 +- src/object.c | 2 +- - 47 files changed, 48 insertions(+), 48 deletions(-) + 49 files changed, 50 insertions(+), 50 deletions(-) diff --git a/include/expr_ops.h b/include/expr_ops.h index a7f1b9a..d2946de 100644 @@ -72,10 +76,10 @@ index a7f1b9a..d2946de 100644 struct expr_ops *nftnl_expr_ops_lookup(const char *name); diff --git a/include/obj.h b/include/obj.h -index 35b5c40..decd1ce 100644 +index 9394d79..08610d7 100644 --- a/include/obj.h +++ b/include/obj.h -@@ -92,7 +92,7 @@ struct obj_ops { +@@ -99,7 +99,7 @@ struct obj_ops { const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nftnl_obj *e, struct nlattr *attr); void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); @@ -157,10 +161,10 @@ index 89a602e..a32a69e 100644 + .snprintf_ = nftnl_expr_counter_snprintf, }; diff --git a/src/expr/ct.c b/src/expr/ct.c -index b9ca2dc..6fbed1d 100644 +index 124de9d..7bde179 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c -@@ -272,5 +272,5 @@ struct expr_ops expr_ops_ct = { +@@ -273,5 +273,5 @@ struct expr_ops expr_ops_ct = { .get = nftnl_expr_ct_get, .parse = nftnl_expr_ct_parse, .build = nftnl_expr_ct_build, @@ -190,10 +194,10 @@ index 68115ba..6e43bb4 100644 + .snprintf_ = nftnl_expr_dynset_snprintf, }; diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c -index bef453e..f2696d6 100644 +index e5f714b..e68792b 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c -@@ -271,5 +271,5 @@ struct expr_ops expr_ops_exthdr = { +@@ -276,5 +276,5 @@ struct expr_ops expr_ops_exthdr = { .get = nftnl_expr_exthdr_get, .parse = nftnl_expr_exthdr_parse, .build = nftnl_expr_exthdr_build, @@ -311,10 +315,10 @@ index 4fa74b2..249c6b5 100644 + .snprintf_ = nftnl_expr_match_snprintf, }; diff --git a/src/expr/meta.c b/src/expr/meta.c -index ffcc896..5eaeb68 100644 +index 73f6efa..35d5ec5 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c -@@ -222,5 +222,5 @@ struct expr_ops expr_ops_meta = { +@@ -226,5 +226,5 @@ struct expr_ops expr_ops_meta = { .get = nftnl_expr_meta_get, .parse = nftnl_expr_meta_parse, .build = nftnl_expr_meta_build, @@ -453,6 +457,17 @@ index 96550d5..2394dbf 100644 - .snprintf = nftnl_expr_socket_snprintf, + .snprintf_ = nftnl_expr_socket_snprintf, }; +diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c +index 245f4fb..9721029 100644 +--- a/src/expr/synproxy.c ++++ b/src/expr/synproxy.c +@@ -166,5 +166,5 @@ struct expr_ops expr_ops_synproxy = { + .get = nftnl_expr_synproxy_get, + .parse = nftnl_expr_synproxy_parse, + .build = nftnl_expr_synproxy_build, +- .snprintf = nftnl_expr_synproxy_snprintf, ++ .snprintf_ = nftnl_expr_synproxy_snprintf, + }; diff --git a/src/expr/target.c b/src/expr/target.c index 9100038..7180085 100644 --- a/src/expr/target.c @@ -508,6 +523,17 @@ index 1baba4e..3710bce 100644 - .snprintf = nftnl_obj_counter_snprintf, + .snprintf_ = nftnl_obj_counter_snprintf, }; +diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c +index c0bb5ba..953c08c 100644 +--- a/src/obj/ct_expect.c ++++ b/src/obj/ct_expect.c +@@ -209,5 +209,5 @@ struct obj_ops obj_ops_ct_expect = { + .get = nftnl_obj_ct_expect_get, + .parse = nftnl_obj_ct_expect_parse, + .build = nftnl_obj_ct_expect_build, +- .snprintf = nftnl_obj_ct_expect_snprintf, ++ .snprintf_ = nftnl_obj_ct_expect_snprintf, + }; diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c index d91f636..2037461 100644 --- a/src/obj/ct_helper.c @@ -575,10 +601,10 @@ index 7ffade8..800eb3e 100644 + .snprintf_ = nftnl_obj_tunnel_snprintf, }; diff --git a/src/object.c b/src/object.c -index 5c8d183..d489cdd 100644 +index d8c87ee..5307d7e 100644 --- a/src/object.c +++ b/src/object.c -@@ -369,7 +369,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, +@@ -370,7 +370,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, SNPRINTF_BUFFER_SIZE(ret, remain, offset); if (obj->ops) { diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.3.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.3.bb deleted file mode 100644 index 00bf88dab..000000000 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" -SECTION = "libs" -DEPENDS = "libmnl" - -SRCREV = "d819a832e0214a3bec3679345f542644596a2850" -SRC_URI = "git://git.netfilter.org/libnftnl \ - file://0001-Move-exports-before-symbol-definition.patch \ - file://0002-avoid-naming-local-function-as-one-of-printf-family.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.4.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.4.bb new file mode 100644 index 000000000..705b6a6c3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" +SECTION = "libs" +DEPENDS = "libmnl" + +SRCREV = "7c19dc01a88dbcf9a45fa791cd27a51b563bcf29" +SRC_URI = "git://git.netfilter.org/libnftnl \ + file://0001-Move-exports-before-symbol-definition.patch \ + file://0002-avoid-naming-local-function-as-one-of-printf-family.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb deleted file mode 100644 index 6c191fbde..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "The tdb library" -HOMEPAGE = "http://tdb.samba.org/" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ - file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" - -SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ - file://tdb-Add-configure-options-for-packages.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ -" - -SRC_URI[md5sum] = "c4c2f8cf9e691244a7f2ecfa3baadecc" -SRC_URI[sha256sum] = "c1a0729c5400fb495465fa4bd953ae290db43c28dacd0506aef50dc482132d35" - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" - -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -S = "${WORKDIR}/tdb-${PV}" - -inherit waf-samba - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -do_install_append() { - # add this link for cross check python module existence. eg: on x86-64 host, check python module - # under recipe-sysroot which is mips64. - cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so -} - -PACKAGES += "tdb-tools python3-tdb" - -RPROVIDES_${PN}-dbg += "python3-tdb-dbg" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -RDEPENDS_python3-tdb = "python3" -INSANE_SKIP_${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb new file mode 100644 index 000000000..d25c3fa65 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb @@ -0,0 +1,57 @@ +SUMMARY = "The tdb library" +HOMEPAGE = "http://tdb.samba.org/" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" + +LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ + file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" + +SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ + file://tdb-Add-configure-options-for-packages.patch \ + file://0001-waf-add-support-of-cross_compile.patch \ +" + +SRC_URI[md5sum] = "d1d0a5d43614add17d1e41bbdb209446" +SRC_URI[sha256sum] = "dd4ecd9678e8d3ea772623bd81fe49b43363a2f970a76fb5468322753787aa4b" + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" + +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +S = "${WORKDIR}/tdb-${PV}" + +inherit waf-samba + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +do_install_append() { + # add this link for cross check python module existence. eg: on x86-64 host, check python module + # under recipe-sysroot which is mips64. + cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so +} + +PACKAGES += "tdb-tools python3-tdb" + +RPROVIDES_${PN}-dbg += "python3-tdb-dbg" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_tdb-tools = "${bindir}/*" +FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +RDEPENDS_python3-tdb = "python3" +INSANE_SKIP_${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb deleted file mode 100644 index deaede857..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb +++ /dev/null @@ -1,88 +0,0 @@ -SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" -DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ -device-mapper mappings. These include plain dm-crypt volumes and \ -LUKS volumes. The difference is that LUKS uses a metadata header \ -and can hence offer more features than plain dm-crypt. On the other \ -hand, the header is visible and vulnerable to damage." -HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" -SECTION = "console" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" - -DEPENDS = " \ - json-c \ - libdevmapper \ - popt \ - util-linux \ -" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "41d8b985ef69242852b93e95d53e8e28" -SRC_URI[sha256sum] = "a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897" - -inherit autotools gettext pkgconfig - -# Use openssl because libgcrypt drops root privileges -# if libgcrypt is linked with libcap support -PACKAGECONFIG ??= " \ - keyring \ - cryptsetup \ - veritysetup \ - cryptsetup-reencrypt \ - integritysetup \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - kernel_crypto \ - internal-argon2 \ - blkid \ - luks-adjust-xts-keysize \ - openssl \ -" -PACKAGECONFIG_append_class-target = " \ - udev \ -" - -PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" -PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" -PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality" -PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc" -PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup" -PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" -PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" -PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" -PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" -# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't -# recognized. -PACKAGECONFIG[gcrypt-pbkdf2] = "--enable-gcrypt-pbkdf2" -PACKAGECONFIG[internal-argon2] = "--enable-internal-argon2,--disable-internal-argon2" -PACKAGECONFIG[internal-sse-argon2] = "--enable-internal-sse-argon2,--disable-internal-sse-argon2" -PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" -PACKAGECONFIG[dev-random] = "--enable-dev-random,--disable-dev-random" -PACKAGECONFIG[luks-adjust-xts-keysize] = "--enable-luks-adjust-xts-keysize,--disable-luks-adjust-xts-keysize" -PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" -PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" -PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" -PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" -PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" -PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" - -RRECOMMENDS_${PN} = "kernel-module-aes-generic \ - kernel-module-dm-crypt \ - kernel-module-md5 \ - kernel-module-cbc \ - kernel-module-sha256-generic \ - kernel-module-xts \ -" - -EXTRA_OECONF = "--enable-static" -# Building without largefile is not supported by upstream -EXTRA_OECONF += "--enable-largefile" -# Requires a static popt library -EXTRA_OECONF += "--disable-static-cryptsetup" -# There's no recipe for libargon2 yet -EXTRA_OECONF += "--disable-libargon2" - -FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb new file mode 100644 index 000000000..6ebf1e279 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb @@ -0,0 +1,88 @@ +SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" +DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ +device-mapper mappings. These include plain dm-crypt volumes and \ +LUKS volumes. The difference is that LUKS uses a metadata header \ +and can hence offer more features than plain dm-crypt. On the other \ +hand, the header is visible and vulnerable to damage." +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" +SECTION = "console" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" + +DEPENDS = " \ + json-c \ + libdevmapper \ + popt \ + util-linux \ +" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" +SRC_URI[md5sum] = "f7818082056e5bc0be12e4c7fc20345a" +SRC_URI[sha256sum] = "9d8f8cac2836a1623c075b5cba96032271dc81a28b2aa27fbd8331e831416bb1" + +inherit autotools gettext pkgconfig + +# Use openssl because libgcrypt drops root privileges +# if libgcrypt is linked with libcap support +PACKAGECONFIG ??= " \ + keyring \ + cryptsetup \ + veritysetup \ + cryptsetup-reencrypt \ + integritysetup \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ + kernel_crypto \ + internal-argon2 \ + blkid \ + luks-adjust-xts-keysize \ + openssl \ +" +PACKAGECONFIG_append_class-target = " \ + udev \ +" + +PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" +PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" +PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality" +PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc" +PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup" +PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" +PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" +PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" +PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" +# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't +# recognized. +PACKAGECONFIG[gcrypt-pbkdf2] = "--enable-gcrypt-pbkdf2" +PACKAGECONFIG[internal-argon2] = "--enable-internal-argon2,--disable-internal-argon2" +PACKAGECONFIG[internal-sse-argon2] = "--enable-internal-sse-argon2,--disable-internal-sse-argon2" +PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" +PACKAGECONFIG[dev-random] = "--enable-dev-random,--disable-dev-random" +PACKAGECONFIG[luks-adjust-xts-keysize] = "--enable-luks-adjust-xts-keysize,--disable-luks-adjust-xts-keysize" +PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" +PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" +PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" +PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" +PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" + +RRECOMMENDS_${PN} = "kernel-module-aes-generic \ + kernel-module-dm-crypt \ + kernel-module-md5 \ + kernel-module-cbc \ + kernel-module-sha256-generic \ + kernel-module-xts \ +" + +EXTRA_OECONF = "--enable-static" +# Building without largefile is not supported by upstream +EXTRA_OECONF += "--enable-largefile" +# Requires a static popt library +EXTRA_OECONF += "--disable-static-cryptsetup" +# There's no recipe for libargon2 yet +EXTRA_OECONF += "--disable-libargon2" + +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.1.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.1.bb deleted file mode 100644 index 190e5dd4e..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \ -and classes for commonly used data structures." -HOMEPAGE = "http://live.gnome.org/Libgee" -SECTION = "libs" -DEPENDS = "glib-2.0" - -BBCLASSEXTEND = "native" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -PE = "1" - -inherit autotools vala pkgconfig gobject-introspection -do_configure_prepend() { - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do - rm -f m4/$i - done -} - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz" -SRC_URI[md5sum] = "d224dca55bb909f6730f40cc267337be" -SRC_URI[sha256sum] = "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.2.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.2.bb new file mode 100644 index 000000000..a048e4832 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \ +and classes for commonly used data structures." +HOMEPAGE = "http://live.gnome.org/Libgee" +SECTION = "libs" +DEPENDS = "glib-2.0" + +BBCLASSEXTEND = "native" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +PE = "1" +inherit gnomebase vala gobject-introspection + +do_configure_prepend() { + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f m4/$i + done +} + +SRC_URI[archive.md5sum] = "45db478f2b300ada8e039ebc6c9458de" +SRC_URI[archive.sha256sum] = "9e035c4b755f46bfae70ba81cdcf8328b03f554373cec8c816e8b5680f85353c" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.8.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.8.bb deleted file mode 100644 index a43408908..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.8.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" - -DEPENDS = "curl openssl zlib libssh2 libgcrypt" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.27" -#v0.27.8 -SRCREV = "2882803ca2b2cdedd069746422155a23fdd002b2" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DTHREADSAFE=ON \ - -DBUILD_CLAR=OFF \ - -DSHA1_TYPE="builtin" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_EXAMPLES=OFF \ - -DLIB_INSTALL_DIR=${libdir} \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb new file mode 100644 index 000000000..3ef7bee43 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb @@ -0,0 +1,24 @@ +SUMMARY = "the Git linkable library" +HOMEPAGE = "http://libgit2.github.com/" +LICENSE = "GPL-2.0-with-GCC-exception & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" + +DEPENDS = "curl openssl zlib libssh2 libgcrypt" + +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.27" +SRCREV = "3828d7afdd08b595584048e8e4dab6ddd4506ed1" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "\ + -DTHREADSAFE=ON \ + -DBUILD_CLAR=OFF \ + -DSHA1_TYPE="builtin" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DBUILD_EXAMPLES=OFF \ + -DLIB_INSTALL_DIR=${libdir} \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.0.1.bb deleted file mode 100644 index e4bb3f326..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4c5de5e7" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git" - -SRCREV = "de6d164822076f9b1e26a7222808a25ac03867d8" - -S = "${WORKDIR}/git" - -inherit cmake - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb new file mode 100644 index 000000000..9e197a918 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" +HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" + +SRC_URI = "git://github.com/leethomason/tinyxml2.git" + +SRCREV = "9c740e8d2341bd46dbe8e87053cdb4d931971967" + +S = "${WORKDIR}/git" + +inherit cmake + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index ca409a6f1..f358663b0 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" -DEPENDS += "util-linux libaio" +DEPENDS += "libaio" SRC_URI = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \ file://lvm.conf \ @@ -27,7 +27,6 @@ LVM2_PACKAGECONFIG = "dmeventd" LVM2_PACKAGECONFIG_append_class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ - udev \ " # odirect is always enabled because there currently is a bug in @@ -41,7 +40,6 @@ PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev" # Unset user/group to unbreak install. EXTRA_OECONF = "--with-user= \ diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb index 4ae0a62ab..9922ef79d 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb @@ -40,6 +40,12 @@ TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" +DEPENDS += "util-linux" +LVM2_PACKAGECONFIG_append_class-target = " \ + udev \ +" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev" + FILES_${PN} += "${libdir}/device-mapper/*.so" FILES_${PN}-scripts = " \ ${sbindir}/blkdeactivate \ diff --git a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb new file mode 100644 index 000000000..9fd88ced9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb @@ -0,0 +1,20 @@ +SUMMARY = "Enumerate all known properties of OpenCL platform and devices." +DESCRIPTION = "clinfo is a simple command-line application that enumerates \ +all possible (known) properties of the OpenCL platform and devices \ +available on the system." +HOMEPAGE = "https://github.com/Oblomov/clinfo" + +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" + +SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https" + +SRCREV = "59d0daf898e48d76ccbb788acbba258fa0a8ba7c" + +S = "${WORKDIR}/git" + +DEPENDS += "opencl-headers opencl-icd-loader" + +do_install() { + install -D -m 755 clinfo ${D}${bindir}/clinfo +} diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb new file mode 100644 index 000000000..332820d14 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb @@ -0,0 +1,21 @@ +SUMMARY = "A graph construction, manipulation, and processing framework" +DESCRIPTION = "ADE Framework is a graph construction, manipulation, \ +and processing framework. ADE Framework is suitable for \ +organizing data flow processing and execution." +HOMEPAGE = "https://github.com/opencv/ade" + +SRC_URI = "git://github.com/opencv/ade.git \ + " + +SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit cmake + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release" + +FILES_${PN}-dev += "${datadir}/${BPN}/*.cmake" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch deleted file mode 100644 index 3c231fe93..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 6287663e7db04df7e6dec58a1fc5bb5d510e8bde Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 9 Apr 2018 19:11:20 +0200 -Subject: [PATCH] CairoOutputDev.cc: fix build error when using fixedpoint -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashRound(SplashCoord)': -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1604:28: error: call of overloaded 'floor(FixedPoint)' is ambiguous -| return (int)floor(x + 0.5); -| ^ -| In file included from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double) -| __MATHCALLX (floor,, (_Mdouble_ __x), (__const__)); -| ^ -| In file included from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46: -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:260:3: note: candidate: constexpr float std::floor(float) -| floor(float __x) -| ^~~~~ -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:264:3: note: candidate: constexpr long double std::floor(long double) -| floor(long double __x) -| ^~~~~ -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashCeil(SplashCoord)': -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1608:21: error: call of overloaded 'ceil(SplashCoord&)' is ambiguous -| return (int)ceil(x); -| ^ -| In file included from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:159:1: note: candidate: double ceil(double) -| __MATHCALLX (ceil,, (_Mdouble_ __x), (__const__)); -| ^ -| In file included from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46: -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:165:3: note: candidate: constexpr float std::ceil(float) -| ceil(float __x) -| ^~~~ -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:169:3: note: candidate: constexpr long double std::ceil(long double) -| ceil(long double __x) -| ^~~~ -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashFloor(SplashCoord)': -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1612:22: error: call of overloaded 'floor(SplashCoord&)' is ambiguous -| return (int)floor(x); -| ^ -| In file included from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, -| from /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: -| /oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double) - -Signed-off-by: Andreas Müller ---- - poppler/CairoOutputDev.cc | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc -index 18124b8f..4c85ad65 100644 ---- a/poppler/CairoOutputDev.cc -+++ b/poppler/CairoOutputDev.cc -@@ -1602,15 +1602,27 @@ void CairoOutputDev::endActualText(GfxState *state) - } - - static inline int splashRound(SplashCoord x) { -+#if defined(USE_FIXEDPOINT) -+ return FixedPoint::floor(x + 0.5); -+#else - return (int)floor(x + 0.5); -+#endif - } - - static inline int splashCeil(SplashCoord x) { -+#if defined(USE_FIXEDPOINT) -+ return FixedPoint::ceil(x); -+#else - return (int)ceil(x); -+#endif - } - - static inline int splashFloor(SplashCoord x) { -+#if defined(USE_FIXEDPOINT) -+ return FixedPoint::floor(x); -+#else - return (int)floor(x); -+#endif - } - - static --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb index b285eecd2..903817f18 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb @@ -4,7 +4,6 @@ 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://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ file://basename-include.patch \ " SRC_URI[md5sum] = "0aac1fcb6466f8b7bdf51871264c7e83" @@ -44,14 +43,6 @@ do_configure_append() { sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja } -# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "-DUSE_FIXEDPOINT=ON" - return "" - -EXTRA_OECMAKE += "${@get_poppler_fpu_setting(bb, d)}" - PACKAGES =+ "libpoppler libpoppler-glib" FILES_libpoppler = "${libdir}/libpoppler.so.*" FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc index fb2d6ed8b..39251525b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc @@ -5,9 +5,11 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://flask_pymongo/wrappers.py;beginline=1;endline=24;md5=424c4e1047d28e01b4e4634a069c019d" -SRC_URI[md5sum] = "d7a1b717f27154e1f3a355f8ec2467d6" -SRC_URI[sha256sum] = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d" +SRC_URI[md5sum] = "94df71e6800b1d7915cc91a74b70f959" +SRC_URI[sha256sum] = "620eb02dc8808a5fcb90f26cab6cba9d6bf497b15032ae3ca99df80366e33314" PYPI_PACKAGE = "Flask-PyMongo" +DEPENDS = "${PYTHON_PN}-vcversioner ${PYTHON_PN}-vcversioner-native" + RDEPENDS_${PN} = "${PYTHON_PN}-pymongo ${PYTHON_PN}-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb deleted file mode 100644 index d41d02348..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-flask-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_2.3.0.bb new file mode 100644 index 000000000..d41d02348 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_2.3.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-flask-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc index b13f10e36..ce95e66c9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec inherit pypi -SRC_URI[md5sum] = "4ec7b2d49a5d1460591e520b54153c87" -SRC_URI[sha256sum] = "b3452bbda12b1cbe2187d416779de07b2ab4c497d83a050e43c344778763721d" +SRC_URI[md5sum] = "ca881f18795e024a2b935d5bae9b1ebe" +SRC_URI[sha256sum] = "d831b047bd69becaf64019a47179eb22118a50dd008340655266a906c69c6417" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.0.bb deleted file mode 100644 index f04fc489f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-protobuf.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.1.bb new file mode 100644 index 000000000..f04fc489f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.9.1.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-protobuf.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-socketio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-socketio.inc index 7ebc4eac7..7ee99f8d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-socketio.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-socketio.inc @@ -12,9 +12,9 @@ PYPI_PACKAGE = "python-socketio" SRC_URI[md5sum] = "86cd47dddea1785ce7a6c72f55c93fe7" SRC_URI[sha256sum] = "506b2cf7a520b40ea0b3f25e1272eff8de134dce6f471c1f6bc0de8c90fe8c57" -PACKAGECONFIG ?= "asyncio_client client" -PACKAGECONFIG[asyncio_client] = ",,,python3-aiohttp python3-websockets" -PACKAGECONFIG[client] = ",,,python3-requests python3-websocket-client" +PACKAGECONFIG ?= "" +PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" +PACKAGECONFIG[client] = ",,,${PYTHON_PN}-requests ${PYTHON_PN}-websocket-client" RDEPENDS_${PN} += "\ ${PYTHON_PN}-engineio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb deleted file mode 100644 index 2102554b6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-flask-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb new file mode 100644 index 000000000..2102554b6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-flask-pymongo.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.0.bb deleted file mode 100644 index 30ea34e90..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -inherit setuptools3 -require python-protobuf.inc - -DEPENDS += "protobuf" -DISTUTILS_BUILD_ARGS += "--cpp_implementation" -DISTUTILS_INSTALL_ARGS += "--cpp_implementation" - -do_compile_prepend_class-native () { - export KOKORO_BUILD_NUMBER="1" -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.1.bb new file mode 100644 index 000000000..30ea34e90 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.9.1.bb @@ -0,0 +1,10 @@ +inherit setuptools3 +require python-protobuf.inc + +DEPENDS += "protobuf" +DISTUTILS_BUILD_ARGS += "--cpp_implementation" +DISTUTILS_INSTALL_ARGS += "--cpp_implementation" + +do_compile_prepend_class-native () { + export KOKORO_BUILD_NUMBER="1" +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.3.1.bb index ce83d09c0..8ff590bd7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.3.1.bb @@ -1,2 +1,4 @@ inherit setuptools3 + +PACKAGECONFIG ?= "asyncio_client client" require python-socketio.inc diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb deleted file mode 100644 index da96086e4..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb +++ /dev/null @@ -1,215 +0,0 @@ -DESCRIPTION = "The Apache HTTP Server is a powerful, efficient, and \ -extensible web server." -SUMMARY = "Apache HTTP Server" -HOMEPAGE = "http://httpd.apache.org/" -SECTION = "net" -LICENSE = "Apache-2.0" - -SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ - file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ - file://0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch \ - file://0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch \ - file://0004-apache2-log-the-SELinux-context-at-startup.patch \ - file://0005-replace-lynx-to-curl-in-apachectl-script.patch \ - file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \ - file://0007-apache2-allow-to-disable-selinux-support.patch \ - file://apache-configure_perlbin.patch \ - " - -SRC_URI_append_class-target = " \ - file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ - file://init \ - file://apache2-volatile.conf \ - file://apache2.service \ - file://volatiles.04_apache2 \ - " - -LIC_FILES_CHKSUM = "file://LICENSE;md5=d52d0fd0bc788f068e647116c01ddfcd" -SRC_URI[md5sum] = "930e217ba2d71e708a3f1521ecae7ec0" -SRC_URI[sha256sum] = "b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2" - -S = "${WORKDIR}/httpd-${PV}" - -inherit autotools update-rc.d pkgconfig systemd update-alternatives - -DEPENDS = "openssl expat pcre apr apr-util apache2-native " - -CVE_PRODUCT = "http_server" - -SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" -PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" -PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib" - -CFLAGS_append = " -DPATH_MAX=4096" - -EXTRA_OECONF_class-target = "\ - --enable-layout=Debian \ - --prefix=${base_prefix} \ - --exec_prefix=${exec_prefix} \ - --includedir=${includedir}/${BPN} \ - --sysconfdir=${sysconfdir}/${BPN} \ - --datadir=${datadir}/${BPN} \ - --libdir=${libdir} \ - --libexecdir=${libdir}/${BPN}/modules \ - --localstatedir=${localstatedir} \ - --enable-ssl \ - --with-dbm=sdbm \ - --with-gdbm=no \ - --with-ndbm=no \ - --with-berkeley-db=no \ - --enable-info \ - --enable-rewrite \ - --enable-mpms-shared \ - ap_cv_void_ptr_lt_long=no \ - ac_cv_have_threadsafe_pollset=no \ - " - -EXTRA_OECONF_class-native = "\ - --prefix=${prefix} \ - --includedir=${includedir}/${BPN} \ - --sysconfdir=${sysconfdir}/${BPN} \ - --datadir=${datadir}/${BPN} \ - --libdir=${libdir} \ - --libexecdir=${libdir}/${BPN}/modules \ - --localstatedir=${localstatedir} \ - " - -do_configure_prepend() { - sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' ${S}/config.layout -} - -do_install_append_class-target() { - install -d ${D}/${sysconfdir}/init.d - - cat ${WORKDIR}/init | \ - sed -e 's,/usr/sbin/,${sbindir}/,g' \ - -e 's,/usr/bin/,${bindir}/,g' \ - -e 's,/usr/lib/,${libdir}/,g' \ - -e 's,/etc/,${sysconfdir}/,g' \ - -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN} - - chmod 755 ${D}/${sysconfdir}/init.d/${BPN} - - # Remove the goofy original files... - rm -rf ${D}/${sysconfdir}/${BPN}/original - - install -d ${D}${sysconfdir}/${BPN}/conf.d - install -d ${D}${sysconfdir}/${BPN}/modules.d - - # Ensure configuration file pulls in conf.d and modules.d - printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - - # Match with that is in init script - printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - - # Set 'ServerName' to fix error messages when restart apache service - sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf - - sed -i 's/^ServerRoot/#ServerRoot/' ${D}/${sysconfdir}/${BPN}/httpd.conf - - sed -i -e 's,${STAGING_DIR_TARGET},,g' \ - -e 's,${DEBUG_PREFIX_MAP},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ - -e 's,${HOSTTOOLS_DIR}/,,g' \ - -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk - - sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's,${DEBUG_PREFIX_MAP},,g' \ - -e 's,${RECIPE_SYSROOT},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ - -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service - elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 - fi - - rm -rf ${D}${localstatedir} - chown -R root:root ${D} -} - -do_install_append_class-native() { - install -d ${D}${bindir} ${D}${libdir} - install -m 755 server/gen_test_char ${D}${bindir} -} - -SYSROOT_PREPROCESS_FUNCS_append_class-target = " apache_sysroot_preprocess" - -apache_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} - install -d ${SYSROOT_DESTDIR}${sbindir} - install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} - sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - - sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -} - -# Implications - used by update-rc.d scripts -INITSCRIPT_NAME = "apache2" -INITSCRIPT_PARAMS = "defaults 91 20" - -SYSTEMD_SERVICE_${PN} = "apache2.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" - -ALTERNATIVE_${PN}-doc = "htpasswd.1" -ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" - -PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" - -CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ - ${sysconfdir}/${BPN}/magic \ - ${sysconfdir}/${BPN}/mime.types \ - ${sysconfdir}/${BPN}/extra/*" - -# We override here rather than append so that .so links are -# included in the runtime package rather than here (-dev) -# and to get build, icons, error into the -dev package -FILES_${PN}-dev = "${datadir}/${BPN}/build \ - ${datadir}/${BPN}/icons \ - ${datadir}/${BPN}/error \ - ${includedir}/${BPN} \ - ${bindir}/apxs \ - " - -# Add the manual to -doc -FILES_${PN}-doc += " ${datadir}/${BPN}/manual" - -FILES_${PN}-scripts += "${bindir}/dbmmanage" - -# Override this too - here is the default, less datadir -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \ - ${sysconfdir} ${libdir}/${BPN}" - -# We want htdocs and cgi-bin to go with the binary -FILES_${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" - -FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug" - -RDEPENDS_${PN} += "openssl libgcc" -RDEPENDS_${PN}-scripts += "perl ${PN}" -RDEPENDS_${PN}-dev = "perl" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb new file mode 100644 index 000000000..a8da7e227 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb @@ -0,0 +1,215 @@ +DESCRIPTION = "The Apache HTTP Server is a powerful, efficient, and \ +extensible web server." +SUMMARY = "Apache HTTP Server" +HOMEPAGE = "http://httpd.apache.org/" +SECTION = "net" +LICENSE = "Apache-2.0" + +SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ + file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ + file://0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch \ + file://0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch \ + file://0004-apache2-log-the-SELinux-context-at-startup.patch \ + file://0005-replace-lynx-to-curl-in-apachectl-script.patch \ + file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \ + file://0007-apache2-allow-to-disable-selinux-support.patch \ + file://apache-configure_perlbin.patch \ + " + +SRC_URI_append_class-target = " \ + file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ + file://init \ + file://apache2-volatile.conf \ + file://apache2.service \ + file://volatiles.04_apache2 \ + " + +LIC_FILES_CHKSUM = "file://LICENSE;md5=d52d0fd0bc788f068e647116c01ddfcd" +SRC_URI[md5sum] = "dfc674f8f454e3bc2d4ccd73ad3b5f1e" +SRC_URI[sha256sum] = "133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40" + +S = "${WORKDIR}/httpd-${PV}" + +inherit autotools update-rc.d pkgconfig systemd update-alternatives + +DEPENDS = "openssl expat pcre apr apr-util apache2-native " + +CVE_PRODUCT = "http_server" + +SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" +PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" +PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib" + +CFLAGS_append = " -DPATH_MAX=4096" + +EXTRA_OECONF_class-target = "\ + --enable-layout=Debian \ + --prefix=${base_prefix} \ + --exec_prefix=${exec_prefix} \ + --includedir=${includedir}/${BPN} \ + --sysconfdir=${sysconfdir}/${BPN} \ + --datadir=${datadir}/${BPN} \ + --libdir=${libdir} \ + --libexecdir=${libdir}/${BPN}/modules \ + --localstatedir=${localstatedir} \ + --enable-ssl \ + --with-dbm=sdbm \ + --with-gdbm=no \ + --with-ndbm=no \ + --with-berkeley-db=no \ + --enable-info \ + --enable-rewrite \ + --enable-mpms-shared \ + ap_cv_void_ptr_lt_long=no \ + ac_cv_have_threadsafe_pollset=no \ + " + +EXTRA_OECONF_class-native = "\ + --prefix=${prefix} \ + --includedir=${includedir}/${BPN} \ + --sysconfdir=${sysconfdir}/${BPN} \ + --datadir=${datadir}/${BPN} \ + --libdir=${libdir} \ + --libexecdir=${libdir}/${BPN}/modules \ + --localstatedir=${localstatedir} \ + " + +do_configure_prepend() { + sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' ${S}/config.layout +} + +do_install_append_class-target() { + install -d ${D}/${sysconfdir}/init.d + + cat ${WORKDIR}/init | \ + sed -e 's,/usr/sbin/,${sbindir}/,g' \ + -e 's,/usr/bin/,${bindir}/,g' \ + -e 's,/usr/lib/,${libdir}/,g' \ + -e 's,/etc/,${sysconfdir}/,g' \ + -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN} + + chmod 755 ${D}/${sysconfdir}/init.d/${BPN} + + # Remove the goofy original files... + rm -rf ${D}/${sysconfdir}/${BPN}/original + + install -d ${D}${sysconfdir}/${BPN}/conf.d + install -d ${D}${sysconfdir}/${BPN}/modules.d + + # Ensure configuration file pulls in conf.d and modules.d + printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + + # Match with that is in init script + printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + + # Set 'ServerName' to fix error messages when restart apache service + sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf + + sed -i 's/^ServerRoot/#ServerRoot/' ${D}/${sysconfdir}/${BPN}/httpd.conf + + sed -i -e 's,${STAGING_DIR_TARGET},,g' \ + -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,${HOSTTOOLS_DIR}/,,g' \ + -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + + sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,${RECIPE_SYSROOT},,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ + -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service + elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 + fi + + rm -rf ${D}${localstatedir} + chown -R root:root ${D} +} + +do_install_append_class-native() { + install -d ${D}${bindir} ${D}${libdir} + install -m 755 server/gen_test_char ${D}${bindir} +} + +SYSROOT_PREPROCESS_FUNCS_append_class-target = " apache_sysroot_preprocess" + +apache_sysroot_preprocess() { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} + install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} + install -d ${SYSROOT_DESTDIR}${sbindir} + install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} + sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs + sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs + + sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk +} + +# Implications - used by update-rc.d scripts +INITSCRIPT_NAME = "apache2" +INITSCRIPT_PARAMS = "defaults 91 20" + +SYSTEMD_SERVICE_${PN} = "apache2.service" +SYSTEMD_AUTO_ENABLE_${PN} = "enable" + +ALTERNATIVE_${PN}-doc = "htpasswd.1" +ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" + +PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" + +CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ + ${sysconfdir}/${BPN}/magic \ + ${sysconfdir}/${BPN}/mime.types \ + ${sysconfdir}/${BPN}/extra/*" + +# We override here rather than append so that .so links are +# included in the runtime package rather than here (-dev) +# and to get build, icons, error into the -dev package +FILES_${PN}-dev = "${datadir}/${BPN}/build \ + ${datadir}/${BPN}/icons \ + ${datadir}/${BPN}/error \ + ${includedir}/${BPN} \ + ${bindir}/apxs \ + " + +# Add the manual to -doc +FILES_${PN}-doc += " ${datadir}/${BPN}/manual" + +FILES_${PN}-scripts += "${bindir}/dbmmanage" + +# Override this too - here is the default, less datadir +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \ + ${sysconfdir} ${libdir}/${BPN}" + +# We want htdocs and cgi-bin to go with the binary +FILES_${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" + +FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug" + +RDEPENDS_${PN} += "openssl libgcc" +RDEPENDS_${PN}-scripts += "perl ${PN}" +RDEPENDS_${PN}-dev = "perl" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb deleted file mode 100644 index c846e7802..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "gtk+ intltool-native xfce4-dev-tools-native" - -inherit xfce-app - -SRC_URI[md5sum] = "4abc6fde56572adf3ec3a0181092584c" -SRC_URI[sha256sum] = "553fc78fe4e7bd2f01f3851baea7e63f6414fe652dfb4b08c60b5c4b2b909164" diff --git a/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.0.bb b/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.0.bb new file mode 100644 index 000000000..4446214f8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "gtk+3 intltool-native xfce4-dev-tools-native" + +inherit xfce-app + +SRC_URI[md5sum] = "273111f5d7c26898e5ddea7b97d5dfe1" +SRC_URI[sha256sum] = "97a301aff012a143d0b99e7ecbb27084d3872aa203a74745e8357aab3a1880dc" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.1.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.1.bb deleted file mode 100644 index 85235490c..000000000 --- a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Simple client plugin for Music Player Daemon" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" -SECTION = "x11/application" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" - -inherit xfce-panel-plugin - -DEPENDS += "libmpd" - -# While this item does not require it, it depends on mpd which does -LICENSE_FLAGS = "commercial" - -# for now we recommend our own mpd-server -RRECOMMENDS_${PN} = "mpd" - -SRC_URI[md5sum] = "305dfdacb2b2198e1f1673d61f86e4f5" -SRC_URI[sha256sum] = "635e678c9729663e9eaadfcf58426f7cea37e6d3fda5e818955fbc8ade00de01" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb new file mode 100644 index 000000000..ff954acb8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb @@ -0,0 +1,18 @@ +SUMMARY = "Simple client plugin for Music Player Daemon" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" +SECTION = "x11/application" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" + +inherit xfce-panel-plugin + +DEPENDS += "libmpd" + +# While this item does not require it, it depends on mpd which does +LICENSE_FLAGS = "commercial" + +# for now we recommend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +SRC_URI[md5sum] = "26a1e8658df2b51967dc2250e23f467d" +SRC_URI[sha256sum] = "eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.2.bb deleted file mode 100644 index 5de1ce5e0..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A battery monitor panel plugin for Xfce4, compatible with APM and ACP" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "ba1cfe619046373f9af5b903c77d1858" -SRC_URI[sha256sum] = "d601349fa9a979dae99ace39b24d99b97f62b80f42ac5dea5a99e5af3e88d7db" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb new file mode 100644 index 000000000..ecbdc265e --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb @@ -0,0 +1,9 @@ +SUMMARY = "A battery monitor panel plugin for Xfce4, compatible with APM and ACP" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "9f82c7e77de0a417716d68d33367973b" +SRC_URI[sha256sum] = "12be0a44d16bd1e1618513ee64f946814925872db7d1c1188ab1454b00d040a3" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch deleted file mode 100644 index 007d3e585..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c35a8cb24e8adafb11cbc261de37d97244e55927 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 11 Aug 2018 10:08:27 -0700 -Subject: [PATCH] panel-plugin: Include sys/sysmacros.h for major/minor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -glibc 2.28+ needs it - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Cc: Andreas Müller ---- - panel-plugin/devperf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c -index 175fd44..cb2e88a 100644 ---- a/panel-plugin/devperf.c -+++ b/panel-plugin/devperf.c -@@ -34,6 +34,7 @@ - #include - #include - /* for major() and minor() */ -+#include - #define _BSD_SOURCE - #include - diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb deleted file mode 100644 index dc7f1fcd9..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Panel plugin displaying instant disk/partition performance" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" - -inherit xfce-panel-plugin - -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ - file://0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch \ - " -SRC_URI[md5sum] = "63d5f03934c2dbddb3ad7bf7f535cc23" -SRC_URI[sha256sum] = "212ddc742be3eecb6ad5554e1b1df03d5685cb71f48a558d5f895de37c57e4fa" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb new file mode 100644 index 000000000..04da55d61 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Panel plugin displaying instant disk/partition performance" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" + +inherit xfce-panel-plugin + +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "538119ea97a217695b297e2d165b305f" +SRC_URI[sha256sum] = "fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb deleted file mode 100644 index 8b924ac75..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin?&#recet_releases" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "c9fcc1ff37f38e6ed518eca3b9887aa8" -SRC_URI[sha256sum] = "6b038322b49d29625219e6a54497085b8f834b9c1fd15282ce286a6529d7c445" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb new file mode 100644 index 000000000..183d521af --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=3434d79d62df09abf5f78bb76d6cd21b" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "d1e1fda4e80c36741643b1d9eca5c5c1" +SRC_URI[sha256sum] = "d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch deleted file mode 100644 index e35418192..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7fcc7352ec11644ac8be4e9ec1584a5be3333684 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 12 Jul 2017 18:18:30 -0700 -Subject: [PATCH] Do not include sys/sysctl.h its unused on linux port - -Signed-off-by: Khem Raj ---- - panel-plugin/os.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/panel-plugin/os.h b/panel-plugin/os.h -index 473c2a4..9a5c544 100644 ---- a/panel-plugin/os.h -+++ b/panel-plugin/os.h -@@ -170,7 +170,6 @@ - #elif __linux__ /* L I N U X */ - # include - # include --# include - # include - # include - # include --- -2.13.2 - diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb deleted file mode 100644 index 35c8861bc..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Panel plugin displaying current load of the network interfaces" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" - -inherit xfce-panel-plugin - -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ - file://0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch \ - " -SRC_URI[md5sum] = "f25aa3242e3119b49f259a3e4a1af08b" -SRC_URI[sha256sum] = "99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.2.bb new file mode 100644 index 000000000..13e7b1db7 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Panel plugin displaying current load of the network interfaces" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" + +inherit xfce-panel-plugin + +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "ae4652711812a77a58c3dc96650a74dc" +SRC_URI[sha256sum] = "22e40425cfe1e07b01fe275b1afddc7c788af34d9c2c7e2842166963cb41215d" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb deleted file mode 100644 index 6289ad31a..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin allowing to send requests directly to browser" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "6f242fe584ee2fdd2b1d3d69ef3d5914" -SRC_URI[sha256sum] = "139539c58d54d878de86ef8a882c793cd909981e6b888f7f9d5e230a8fe310a4" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb new file mode 100644 index 000000000..fa2c474d6 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin allowing to send requests directly to browser" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "f1c97ac62dd9054e8f2b01568fef3ba6" +SRC_URI[sha256sum] = "3e28fb7cd2e2251e89a8715684081b862406e3fb4e6d8c0caa1b798a97703600" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.2.bb deleted file mode 100644 index f9fb2cad7..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" - -inherit xfce-panel-plugin - -DEPENDS += "upower" - -SRC_URI[md5sum] = "c7b9237ec4a421de5dac76449b4b5a78" -SRC_URI[sha256sum] = "3c67dfeb042eaea5aca440de9c6b3ecf99be0fbaa1cf7fdf9e6528233b46c99e" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb new file mode 100644 index 000000000..88d40c495 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" + +inherit xfce-panel-plugin + +DEPENDS += "upower" + +SRC_URI[md5sum] = "5d75865be699d0b3d36a5fc17ed02d44" +SRC_URI[sha256sum] = "052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb deleted file mode 100644 index facbb0d86..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "This plugin makes it possible to take periodical breaks" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "d7d743794a766ba1b00647828a099053" -SRC_URI[sha256sum] = "c69fb7218c685e516454810291c5245c49a80d774a6bded59c645a1af427c4e5" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb new file mode 100644 index 000000000..4218c0c50 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb @@ -0,0 +1,10 @@ +SUMMARY = "This plugin makes it possible to take periodical breaks" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "81e1a961032c7b87d672bed09c681a73" +SRC_URI[sha256sum] = "7f9cd4694e83d9cc5e41140d174dcc5ffe00fd546f2706f619031039ad7e0f6b" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb deleted file mode 100644 index 0c94f3c4b..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin displaying stats from a wireless lan interface" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "b163b22f8543e5e5767a68af35c9028e" -SRC_URI[sha256sum] = "4d5bd6654cfd077f3432b08d296f7bd052e765e51b77c629886a9542f4e5ecdc" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb new file mode 100644 index 000000000..6ffa35aad --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying stats from a wireless lan interface" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "e4e3d5240297253d242464e77f6145df" +SRC_URI[sha256sum] = "f41f81ea063ae3c7d7904e1ee647a6b5efafc7436f47caed662ee417038eed17" -- cgit v1.2.3 From 0f291cce3faf2fd387c0db8f04bd2f9f4187f6df Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 1 Sep 2019 15:16:57 -0400 Subject: meta-openembedded: subtree update:1e8bc46e55..6a5d6bc9ad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aaltonen Eero (1): Recipe for docopt.cpp option parsing library Aaron Chan (1): python3-pyatspi: Add Dbus ATSPI recipe Adrian Bunk (11): xmlsec1: Import from meta-security libgit2: Upgrade 0.27.9 -> 0.28.3 libenv-perl: Import from meta-security libgit2: Don't pass parameters with their default values to cmake Replace EXCLUDE_FROM_WORLD_libc-musl = "1" with COMPATIBLE_HOST_libc-musl = 'null' libwebsockets: Fix the build with -Os mimic: Fix the build with -Os Adapt to the lsb -> lsb-release change in OE-core meta-oe: Replace EXCLUDE_FROM_WORLD_libc-musl = "1" with COMPATIBLE_HOST_libc-musl = 'null' Remove LICENSE = "MIT" from packagegroups and images Remove bogus COMMON_LICENSE_DIR usage in LIC_FILES_CHKSUM Andreas Müller (4): cmark: initial add 0.29.0 libsigc++-2.0: upgrade 2.10.1 -> 2.10.2 glibmm: upgrade 2.58.1 -> 2.60.0 evolution-data-server: remove unused gconf dep and pythonnative dep Anuj Mittal (2): pugixml: add recipe vlc: don't look at host headers for live555 Bruce Ashfield (1): dnsmasq: fix build against 5.2 headers Callaghan, Dan (1): python3-pystemd: add new recipe Changqing Li (3): xfsprogs: support usrmerge ntfs-3g-ntfsprogs: support usrmerge grubby: support usrmerge Chris Laplante (1): breakpad: fix patch striplevel to avoid 'devtool modify breakpad' error Christophe PRIOUZEAU (1): python-script: update license md5sum Gianfranco Costamagna (2): libmodbus: update version to 3.1.6 ifmetric: add initial recipe based on Debian packaging and patches Hongxu Jia (4): libdevmapper/lvm2: force recipe libdevmapper to populate sysroot only multipath-tools: lvm2 to DEPENDS cryptsetup: add libdevmapper to RDEPENDS cryptsetup: add libdevmapper to RDEPENDS Kai Kang (1): xfce4-datetime-setter: fix compile error and requires distro feature x11 Khem Raj (14): libgpiod: nherit python3native unconditionally kernel-selftest: Warn conditionally about clang-native dependency docopt.cpp: Drop using gitpkgv libnss-nisplus: Fix build with glibc >= 2.30 bpftool.bb: Disable SECURITY_CFLAGS kernel-selftest: Explicitly disable stack protector ncmpc: Update to 0.34 websocketpp_0.8.1.bb: Fix build with asio from boost 1.70+ can-utils: Fix build with kernel headers >= 5.2 android-tools: update license md5sum for BSD-2-Clause can-isotp: Update to latest tip linux-atm: Fix build with kernel headers 5.2+ drbd: Upgrade to 9.0.19-1 ssiapi: Upgrade to 1.3.0 Klauer, Daniel (1): sjf2410-linux-native: Fix do_deploy sstate caching Oleksandr Kravchuk (1): nftables: update to 0.9.2 Piotr Tworek (18): libmxml: Use autotools bbclass and cleanup the recipe a bit. evolution-data-server: Update to version 3.32.4 evolution-data-server: Drop x11 as required distro feature. evolution-data-server: Inherit upstream-version-is-even bbclass. evolution-data-server: Add dedicated packages for libebook-contacts. evolution-data-server: Specify SYSCONF_INSTALL_DIR in EXTRA_OECMAKE. evolution-data-server: Drop bits related to autotools evolution-data-server: Add PACKAGECONFIGs for oauth2 and kerberos. evolution-data-server: Drop ENABLE_UOA from EXTRA_OECMAKE. evolution-data-server: Drop glade file references. evolution-data-server: Fix package gobject-introspection support. evolution-data-server: Add PACKAGECONFIG for vala bindings. evolution-data-server: Turn goa support into PACKAGECONFIG feature. evolution-data-server: Add weather PACKAGECONFIG feature. evolution-data-server: Add PACKAGECONFIG entry for phonenumber. evolution-data-server: Use SRC_URI provided by gnomebase. evolution-data-server: Remove unused FILES paterns. evolution-data-server: Don't use explicit version number for libebook Qi.Chen@windriver.com (1): libblockdev: fix PACKAGECONFIG regarding python Robert Yang (1): netcf: Fix Manifest not found issue Yi Zhao (1): samba: upgrade 4.10.6 -> 4.10.7 Yuan Chao (11): python-typing: upgrade 3.7.4 -> 3.7.4.1 python-twisted: upgrade 19.2.1 -> 19.7.0 python-jsonschema: upgrade 2.6.0 -> 3.0.2 kpatch: upgrade 0.7.1 -> 0.8.0 libtdb: upgrade 1.4.1 -> 1.4.2 python-paste: upgrade 3.1.0 -> 3.1.1 python-pip: upgrade 19.2.2 -> 19.2.3 python-pytest: upgrade 3.4.2 -> 5.1.1 python3-xxhash: upgrade 1.3.0 -> 1.4.1 python-pluggy: upgrade 0.6.0 -> 0.12.0 python-cmd2: upgrade 0.9.2 -> 0.9.16 Zang Ruochen (3): python-futures: upgrade 3.2.0 -> 3.3.0 python-pyyaml: upgrade 3.13 -> 5.1.2 python-alembic: upgrade 1.0.11 -> 1.1.0 Change-Id: I3b55c2efba09c26e31018ee2cbbc908f06630c7c Signed-off-by: Brad Bishop --- meta-openembedded/file | 0 .../files/0001-Make-build-support-usrmerge.patch | 43 + .../ntfs-3g-ntfsprogs_2017.3.23.bb | 1 + .../xfsprogs/files/0001-support-usrmerge.patch | 40 + .../recipes-utils/xfsprogs/xfsprogs_5.2.1.bb | 7 +- ...1-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch | 20 +- ...ists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 10 +- ...lace-the-Novell-sample-contact-with-somet.patch | 10 +- ...suffix-to-exacutables-produced-and-run-du.patch | 50 + ...commended-way-to-handle-the-icu-namespace.patch | 46 - ...AGES-for-address-localization-when-LC_ADD.patch | 33 + ...r-lib-to-LDFLAGS-when-linking-libphonenum.patch | 36 + ...ect-intrispection-support-to-work-with-OE.patch | 75 ++ .../eds/evolution-data-server_3.26.6.bb | 132 -- .../eds/evolution-data-server_3.32.4.bb | 155 +++ .../images/initramfs-kexecboot-image.bb | 2 - .../recipes-devtools/grubby/grubby_git.bb | 2 +- .../recipes-multimedia/mimic/mimic_1.2.0.2.bb | 2 + .../recipes-multimedia/musicpd/ncmpc_0.33.bb | 37 - .../recipes-multimedia/musicpd/ncmpc_0.34.bb | 37 + .../meta-multimedia/recipes-multimedia/vlc/vlc.inc | 2 +- .../recipes-connectivity/rdist/rdist_6.1.5.bb | 2 +- .../recipes-connectivity/samba/samba_4.10.6.bb | 329 ----- .../recipes-connectivity/samba/samba_4.10.7.bb | 329 +++++ .../recipes-daemons/opensaf/opensaf_5.19.07.bb | 2 +- .../recipes-filter/nftables/nftables_0.9.1.bb | 28 - .../recipes-filter/nftables/nftables_0.9.2.bb | 28 + .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 3 - .../netkit-rusers/netkit-rusers_0.17.bb | 2 +- .../netkit-telnet/netkit-telnet_0.17.bb | 2 +- ...001-dnsmasq-fix-build-against-5.2-headers.patch | 31 + .../recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 + .../recipes-support/drbd/drbd_9.0.18-1.bb | 24 - .../recipes-support/drbd/drbd_9.0.19-1.bb | 23 + .../ifmetric/ifmetric/ifmetric.8_typo.patch | 15 + .../ifmetric/ifmetric.c_netlink-invalid-arg.patch | 16 + .../ifmetric/ifmetric/ifmetric.c_typo.patch | 24 + .../nlrequest.c_packet-too-small_fix.patch | 16 + .../recipes-support/ifmetric/ifmetric_0.3.bb | 17 + .../recipes-support/libtdb/libtdb_1.4.1.bb | 57 - .../recipes-support/libtdb/libtdb_1.4.2.bb | 57 + ...mdump-Include-linux-sockios.h-for-SIOCGST.patch | 59 + .../recipes-support/linux-atm/linux-atm_2.5.2.bb | 1 + .../recipes-support/netcf/netcf_0.2.8.bb | 4 +- meta-openembedded/meta-oe/conf/layer.conf | 4 +- .../phoronix-test-suite_8.8.1.bb | 2 +- .../libwebsockets/libwebsockets_3.1.0.bb | 2 + .../meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb | 35 - .../meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb | 35 + .../libsigc++-2.0/libsigc++-2.0_2.10.1.bb | 22 - .../libsigc++-2.0/libsigc++-2.0_2.10.2.bb | 20 + .../packagegroups/packagegroup-basic.bb | 2 - .../packagegroups/packagegroup-boot.bb | 2 - .../recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb | 4 + .../android-tools/android-tools_5.1.1.r37.bb | 2 +- .../recipes-devtools/breakpad/breakpad_git.bb | 2 +- .../packagegroups/packagegroup-sdk-target.bb | 2 - .../recipes-devtools/pugixml/pugixml_1.9.bb | 20 + .../python/python-futures_3.2.0.bb | 13 - .../python/python-futures_3.3.0.bb | 13 + .../0001-Set-library-VERSION-and-SOVERSION.patch | 31 + .../recipes-extended/docopt.cpp/docopt.cpp_git.bb | 27 + .../libblockdev/libblockdev_2.22.bb | 6 +- ...float-endianness-issue-on-big-endian-arch.patch | 314 +++++ .../libmodbus/libmodbus/Fix-typo.patch | 52 + .../f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch | 32 + .../recipes-extended/libmodbus/libmodbus_3.1.4.bb | 4 - .../recipes-extended/libmodbus/libmodbus_3.1.6.bb | 12 + .../libnss-nisplus/libnss-nisplus.bb | 1 + ...nisplus-hosts-Remove-use-of-RES_USE_INET6.patch | 245 ++++ .../recipes-extended/socketcan/can-isotp_git.bb | 2 +- ...ude-to-find-SIOCGSTAMP-with-latest-kernel.patch | 106 ++ .../recipes-extended/socketcan/can-utils_git.bb | 4 +- .../meta-oe/recipes-kernel/bpftool/bpftool.bb | 4 +- .../meta-oe/recipes-kernel/crash/crash_7.2.6.bb | 2 +- .../kernel-selftest/kernel-selftest.bb | 29 +- .../meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 +- .../minicoredumper/minicoredumper_2.0.1.bb | 2 +- .../recipes-multimedia/alsa/alsa-oss_1.1.8.bb | 2 +- .../recipes-security/keyutils/keyutils_1.6.bb | 2 +- .../meta-oe/recipes-support/cmark/cmark_git.bb | 17 + .../daemontools/daemontools_0.76.bb | 2 +- .../recipes-support/libgit2/libgit2_0.27.9.bb | 24 - .../recipes-support/libgit2/libgit2_0.28.3.bb | 20 + .../recipes-support/libgpiod/libgpiod_1.4.1.bb | 3 +- .../meta-oe/recipes-support/libmxml/libmxml_3.0.bb | 33 + .../meta-oe/recipes-support/libmxml/libmxml_git.bb | 44 - .../recipes-support/lvm2/libdevmapper_2.03.02.bb | 6 +- .../0001-explicitly-do-not-install-libdm.patch | 65 - .../meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb | 18 +- .../multipath-tools/multipath-tools_0.8.1.bb | 3 +- .../samsung-soc-utils/sjf2410-linux-native_svn.bb | 3 +- .../ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch | 116 ++ .../ssiapi/ssiapi/0001-Include-libgen.h.patch | 32 + .../0001-Use-pragma-once-unconditionally.patch | 872 ------------ ...og-Avoid-shadowing-functions-from-std-lib.patch | 57 + ...itor-ordered-comparison-between-pointers-.patch | 39 - .../0002-Convert-macros-into-functions.patch | 123 -- .../ssiapi/0002-Use-stangard-int-types.patch | 54 + .../ssiapi/0002-boost-Backport-clang-support.patch | 1409 ++++++++++++++++++++ ...-canonicalize_file_name-with-realpath-API.patch | 33 - ...ne-discover-const-String-path-in-base-cla.patch | 47 + ...lace-canonicalize_file_name-with-realpath.patch | 43 + ...rride-flags-coming-from-build-environment.patch | 33 + ...ne-Fix-indentation-and-missing-semi-colon.patch | 54 - .../ssiapi/ssiapi/0004-include-limits.h.patch | 25 + .../0005-enable-out-of-source-tree-builds.patch | 228 ++++ .../ssiapi/0005-engine-Define-SENTINEL.patch | 40 - ...issing-includes-and-use-realpath-instead-.patch | 40 - .../ssiapi/ssiapi/configure-cflags.patch | 21 - .../meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb | 35 - .../meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb | 36 + .../websocketpp-0.8.1/0001-Fix-issue-599.patch | 31 - ...eplace-make_shared-with-new-in-some-cases.patch | 78 ++ .../0002-Fix-missed-entries-fix-testing.patch | 66 + .../4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch | 155 --- .../9ddb300d874a30db35e3ad58f188944bef0bf31b.patch | 600 --------- .../websocketpp-0.8.1/disable-tests.patch | 51 - .../websocketpp/websocketpp_0.8.1.bb | 5 +- .../xmlsec1/change-finding-path-of-nss.patch | 67 + .../xmlsec1/xmlsec1/fix-ltmain.sh.patch | 26 + .../xmlsec1/xmlsec1/makefile-ptest.patch | 40 + .../recipes-support/xmlsec1/xmlsec1/run-ptest | 85 ++ ...sec1-examples-allow-build-in-separate-dir.patch | 30 + .../recipes-support/xmlsec1/xmlsec1_1.2.28.bb | 64 + .../meta-oe/recipes-test/pm-qa/pm-qa_git.bb | 2 +- .../recipes-perl/libenv/libenv-perl_1.04.bb | 21 + .../recipes-devtools/python/python-alembic.inc | 4 +- .../python/python-alembic_1.0.11.bb | 2 - .../python/python-alembic_1.1.0.bb | 2 + .../recipes-devtools/python/python-cmd2_0.9.16.bb | 25 + .../recipes-devtools/python/python-cmd2_0.9.2.bb | 23 - .../recipes-devtools/python/python-daemon_2.1.2.bb | 4 +- .../python/python-grpcio-tools.inc | 4 +- .../recipes-devtools/python/python-grpcio.inc | 4 +- .../recipes-devtools/python/python-intervals.inc | 4 +- .../recipes-devtools/python/python-jsonschema.inc | 6 +- .../python/python-jsonschema_2.6.0.bb | 12 - .../python/python-jsonschema_3.0.2.bb | 12 + .../python/python-lockfile_0.12.2.bb | 2 +- .../recipes-devtools/python/python-paste_3.1.0.bb | 17 - .../recipes-devtools/python/python-paste_3.1.1.bb | 17 + .../recipes-devtools/python/python-pint.inc | 2 +- .../recipes-devtools/python/python-pip_19.2.2.bb | 14 - .../recipes-devtools/python/python-pip_19.2.3.bb | 14 + .../recipes-devtools/python/python-pluggy.inc | 8 +- .../python/python-pluggy_0.12.0.bb | 2 + .../recipes-devtools/python/python-pluggy_0.6.0.bb | 2 - .../recipes-devtools/python/python-protobuf.inc | 2 +- .../recipes-devtools/python/python-pytest.inc | 8 +- ...ove-the-setup_requires-for-setuptools-scm.patch | 36 +- .../python/python-pytest/pytest_version_fix.patch | 51 - .../recipes-devtools/python/python-pytest_3.4.2.bb | 9 - .../recipes-devtools/python/python-pytest_5.1.1.bb | 9 + .../recipes-devtools/python/python-pyyaml.inc | 6 +- .../recipes-devtools/python/python-pyyaml_3.13.bb | 2 - .../recipes-devtools/python/python-pyyaml_5.1.2.bb | 2 + .../python/python-robotframework-seriallibrary.inc | 2 +- .../recipes-devtools/python/python-scrypt.inc | 2 +- .../recipes-devtools/python/python-twisted.inc | 6 +- .../python/python-twisted_19.2.1.bb | 8 - .../python/python-twisted_19.7.0.bb | 8 + .../recipes-devtools/python/python-typing.inc | 4 +- .../python/python-typing_3.7.4.1.bb | 2 + .../recipes-devtools/python/python-typing_3.7.4.bb | 2 - .../recipes-devtools/python/python-xxhash.inc | 6 +- .../python/python3-alembic_1.0.11.bb | 2 - .../python/python3-alembic_1.1.0.bb | 2 + .../python/python3-jsonschema_2.6.0.bb | 2 - .../python/python3-jsonschema_3.0.2.bb | 2 + .../python/python3-pluggy_0.12.0.bb | 2 + .../python/python3-pluggy_0.6.0.bb | 2 - .../python/python3-pyatspi_2.32.1.bb | 16 + .../python/python3-pystemd_0.6.0.bb | 13 + .../python/python3-pytest_3.4.2.bb | 4 - .../python/python3-pytest_5.1.1.bb | 4 + .../recipes-devtools/python/python3-pyyaml_3.13.bb | 2 - .../python/python3-pyyaml_5.1.2.bb | 2 + .../python/python3-twisted_19.2.1.bb | 65 - .../python/python3-twisted_19.7.0.bb | 65 + .../python/python3-xxhash_1.3.0.bb | 2 - .../python/python3-xxhash_1.4.1.bb | 2 + .../files/fix-inner-dependency.patch | 28 + .../xfce4-datetime-setter_3.32.2.bb | 7 +- .../packagegroups/packagegroup-xfce-multimedia.bb | 2 - .../packagegroups/packagegroup-xfce-base.bb | 2 - .../packagegroups/packagegroup-xfce-extended.bb | 2 - 187 files changed, 5018 insertions(+), 3322 deletions(-) create mode 100644 meta-openembedded/file create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb delete mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.18-1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb create 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/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Fix-issue-599.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Replace-make_shared-with-new-in-some-cases.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/disable-tests.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch create mode 100755 meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest create mode 100644 meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.0.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.13.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_5.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.0.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.13.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/file b/meta-openembedded/file new file mode 100644 index 000000000..e69de29bb diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch new file mode 100644 index 000000000..fce10b999 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch @@ -0,0 +1,43 @@ +From 33f678bf74367aab8ddc2858a9f7797455ea9b9f Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 29 Aug 2019 10:21:58 +0800 +Subject: [PATCH] Make build support usrmerge + +Upstream-Status: Inappropriate[oe-specific] + +Signed-off-by: Changqing Li +--- + ntfsprogs/Makefile.am | 2 -- + src/Makefile.am | 3 --- + 2 files changed, 5 deletions(-) + +diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am +index f4f9d1b..1f6a673 100644 +--- a/ntfsprogs/Makefile.am ++++ b/ntfsprogs/Makefile.am +@@ -165,8 +165,6 @@ extras: libs $(EXTRA_PROGRAMS) + + if ENABLE_MOUNT_HELPER + install-exec-hook: +- $(INSTALL) -d $(DESTDIR)/sbin +- $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs + + install-data-hook: + $(INSTALL) -d $(DESTDIR)$(man8dir) +diff --git a/src/Makefile.am b/src/Makefile.am +index 8d98408..d0a6a45 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -66,9 +66,6 @@ endif + + if ENABLE_MOUNT_HELPER + install-exec-local: install-rootbinPROGRAMS +- $(MKDIR_P) "$(DESTDIR)/sbin" +- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" +- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" + + install-data-local: install-man8 + $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" +-- +2.7.4 + diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index addb4d351..1559bfd3f 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-Make-build-support-usrmerge.patch','',d)} \ " S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch new file mode 100644 index 000000000..84f4f88e5 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch @@ -0,0 +1,40 @@ +From e81633a276dd6a9f919e5e5c15481ac50a8e485d Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 30 Aug 2019 14:59:06 +0800 +Subject: [PATCH] support usrmerge + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li +--- + configure.ac | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4b7e4c8..f1afbd6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,8 +110,7 @@ AC_ARG_ENABLE(libicu, + # If the user specified a libdir ending in lib64 do not append another + # 64 to the library names. + # +-base_libdir=`basename "$libdir"` +-case $base_libdir in ++case `basename "$libdir"` in + lib64) + enable_lib64=no + esac +@@ -125,8 +124,8 @@ esac + # + case $exec_prefix:$prefix in + NONE:NONE | NONE:/usr | /usr:*) +- root_sbindir='/sbin' +- root_libdir="/${base_libdir}" ++ root_sbindir="${base_sbindir}" ++ root_libdir="${base_libdir}" + ;; + *) + root_sbindir="${sbindir}" +-- +2.7.4 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb index bed80a615..5ab1d028f 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb @@ -11,6 +11,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://0001-build-Check-for-sync_file_range-libc-function.patch \ file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ + file://0001-support-usrmerge.patch \ " SRC_URI[md5sum] = "5ca3f79e76e3fb984a03d1b42a2e60ba" SRC_URI[sha256sum] = "7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae" @@ -68,6 +69,8 @@ do_install_append() { rm ${D}${libdir}/*.la rmdir --ignore-fail-on-non-empty ${D}${libdir} - ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a - ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so + if [ ${libdir} != ${base_libdir} ];then + ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a + ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so + fi } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch index a821a14ab..cc9dca4ea 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch @@ -1,7 +1,7 @@ -From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001 +From e32075119803f9fffbba01a31083e416cb213011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 19 Dec 2017 16:37:20 +0100 -Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv +Subject: [PATCH 1/7] CMakeLists.txt: Remove TRY_RUN for iconv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,18 +13,20 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller --- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) + CMakeLists.txt | 6 ------ + 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d07772..a2396f2 100644 +index f9d72db..ed99904 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV) - endif(NOT HAVE_ICONV) +@@ -526,15 +526,9 @@ endif(NOT HAVE_ICONV) set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS}) --CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator) +-CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\" +- #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + unset(_binary_dir_with_separator) unset(CMAKE_REQUIRED_LIBRARIES) -if(NOT _correct_iconv) @@ -35,5 +37,5 @@ index 8d07772..a2396f2 100644 # Backtraces for debugging # ****************************** -- -2.14.3 +2.21.0 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch index c8dc7e12c..23c3a96d4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch @@ -1,7 +1,7 @@ -From 210b204d9edd71202454ff04013cc52b23c598e4 Mon Sep 17 00:00:00 2001 +From 20bd8946a5c73290d961df151e82033171639c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 19 Dec 2017 16:55:13 +0100 -Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check +Subject: [PATCH 2/7] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller 1 file changed, 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a2396f2..f3b271b 100644 +index ed99904..9a2e99f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -573,29 +573,6 @@ CHECK_C_SOURCE_COMPILES("#include +@@ -579,29 +579,6 @@ CHECK_C_SOURCE_COMPILES("#include CHECK_C_SOURCE_COMPILES("#include int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2) @@ -49,5 +49,5 @@ index a2396f2..f3b271b 100644 # system mail stuff # ****************************** -- -2.14.3 +2.21.0 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch index 3cdfa8b6f..c9e6f96f5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch @@ -1,14 +1,14 @@ -From 4df8bd8ae4258289663b27af1207027c7ee06340 Mon Sep 17 00:00:00 2001 +From d616eddf3a214a49900344f4455155879d3b82db Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 4 Aug 2013 09:13:25 +0200 -Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something +Subject: [PATCH 3/7] contact: Replace the Novell sample contact with something more appropriate Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa --- - src/addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++------------- - 2 files changed, 103 insertions(+), 77 deletions(-) + src/addressbook/libedata-book/ximian-vcard.h | 179 +++++++++++-------- + 1 file changed, 102 insertions(+), 77 deletions(-) diff --git a/src/addressbook/libedata-book/ximian-vcard.h b/src/addressbook/libedata-book/ximian-vcard.h index 782d37b..5b0b250 100644 @@ -198,5 +198,5 @@ index 782d37b..5b0b250 100644 +" gQIUKE+H+C/wMGX8Ias1s6CQAAAABJRU5ErkJggg==\n" \ "END:VCARD" -- -1.8.3.2 +2.21.0 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch new file mode 100644 index 000000000..67023df2c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch @@ -0,0 +1,50 @@ +From 30bd4ae3badb152c9f81c6d34014c586fa0cc825 Mon Sep 17 00:00:00 2001 +From: Piotr Tworek +Date: Mon, 12 Aug 2019 14:13:52 +0200 +Subject: [PATCH 4/7] Add native suffix to exacutables produced and run during + build process. + +CMake can't build tools for the host system when cross compiling. As +result eds currently fails to build in OE due to some programs being +cross compiled for the target and run on the host. To work around this +limitation modify existing targets using build time generated binaries +to invoke binaries suffixed with -native. We can inject such binaries +into expected locations prior to invoking ninja in do_compile. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Piotr Tworek +--- + src/addressbook/libebook-contacts/CMakeLists.txt | 2 +- + src/camel/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt +index e9e3259..2ae72a8 100644 +--- a/src/addressbook/libebook-contacts/CMakeLists.txt ++++ b/src/addressbook/libebook-contacts/CMakeLists.txt +@@ -25,7 +25,7 @@ target_link_libraries(gen-western-table + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h +- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h ++ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table-native "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h + DEPENDS gen-western-table e-name-western-tables.h.in + ) + +diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt +index be626a8..9226b2b 100644 +--- a/src/camel/CMakeLists.txt ++++ b/src/camel/CMakeLists.txt +@@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c +- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c ++ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables-native >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c + DEPENDS camel-gen-tables + ) + +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch deleted file mode 100644 index d3b0ac673..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 5 May 2018 17:46:52 -0700 -Subject: [PATCH] Use recommended way to handle the icu namespace - -Fixes build with icu >= 61 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/libedataserver/e-alphabet-index-private.cpp | 2 ++ - src/libedataserver/e-transliterator-private.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp -index d3e44f4..ddffd99 100644 ---- a/src/libedataserver/e-alphabet-index-private.cpp -+++ b/src/libedataserver/e-alphabet-index-private.cpp -@@ -33,9 +33,11 @@ - - /* ICU headers */ - #include -+#include - - using icu::AlphabeticIndex; - using icu::Locale; -+using U_ICU_NAMESPACE::UnicodeString; - - struct _EAlphabetIndex { - AlphabeticIndex *priv; -diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp -index bb15593..573446f 100644 ---- a/src/libedataserver/e-transliterator-private.cpp -+++ b/src/libedataserver/e-transliterator-private.cpp -@@ -33,8 +33,10 @@ - - /* ICU headers */ - #include -+#include - - using icu::Transliterator; -+using U_ICU_NAMESPACE::UnicodeString; - - struct _ETransliterator { - Transliterator *priv; diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch new file mode 100644 index 000000000..55ab5a7fc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch @@ -0,0 +1,33 @@ +From 95425206e7317e59b7ca06d7f838ad357cdd200c Mon Sep 17 00:00:00 2001 +From: Piotr Tworek +Date: Wed, 14 Aug 2019 00:31:54 +0200 +Subject: [PATCH 5/7] Use LC_MESSAGES for address localization when LC_ADDRESS + is not available. + +Musl does not define LC_ADDRESS unfortunately. + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Piotr Tworek +--- + src/addressbook/libebook-contacts/e-phone-number-private.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/addressbook/libebook-contacts/e-phone-number-private.cpp b/src/addressbook/libebook-contacts/e-phone-number-private.cpp +index 4c5aebb..9abcebd 100644 +--- a/src/addressbook/libebook-contacts/e-phone-number-private.cpp ++++ b/src/addressbook/libebook-contacts/e-phone-number-private.cpp +@@ -36,6 +36,10 @@ + #include + #include + ++#ifndef LC_ADDRESS ++#define LC_ADDRESS LC_MESSAGES ++#endif ++ + using i18n::phonenumbers::PhoneNumber; + using i18n::phonenumbers::PhoneNumberUtil; + +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch new file mode 100644 index 000000000..c0c1427fd --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch @@ -0,0 +1,36 @@ +From fb9164bbca5b425f1cf1bb3cac51d06afe81938a Mon Sep 17 00:00:00 2001 +From: Piotr Tworek +Date: Wed, 14 Aug 2019 00:47:59 +0200 +Subject: [PATCH 6/7] Dont add /usr/lib to LDFLAGS when linking libphonenumber. + +This will refer to host lib dir which is not what we want. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Piotr Tworek +--- + cmake/modules/FindPhonenumber.cmake | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cmake/modules/FindPhonenumber.cmake b/cmake/modules/FindPhonenumber.cmake +index 04d1056..70c0c41 100644 +--- a/cmake/modules/FindPhonenumber.cmake ++++ b/cmake/modules/FindPhonenumber.cmake +@@ -37,12 +37,10 @@ string(TOUPPER "${WITH_PHONENUMBER}" optupper) + if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) + set(WITH_PHONENUMBER "ON") + set(PHONENUMBER_INCLUDE_DIRS "${INCLUDE_INSTALL_DIR}") +- set(PHONENUMBER_LIB_DIRS ${LIB_INSTALL_DIR}) +- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) ++ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) + else(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) + set(PHONENUMBER_INCLUDE_DIRS "${WITH_PHONENUMBER}/include") +- set(PHONENUMBER_LIB_DIRS ${WITH_PHONENUMBER}/lib${LIB_SUFFIX}) +- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) ++ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) + endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) + + unset(bindirlen) +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch new file mode 100644 index 000000000..c00082a2c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch @@ -0,0 +1,75 @@ +From d84f4fd68441e934b37be2a6917abad52c5d1bda Mon Sep 17 00:00:00 2001 +From: Piotr Tworek +Date: Fri, 16 Aug 2019 21:22:16 +0200 +Subject: [PATCH 7/7] Modify gobject-intrispection support to work with OE. + +1. Use tools provided by the recipe sysroot instread of host ones. +2. Make sure all the required dirs make it into g-ir-scanner via + LDFLAGS. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Piotr Tworek +--- + cmake/modules/GObjectIntrospection.cmake | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake +index 5be5042..67c035a 100644 +--- a/cmake/modules/GObjectIntrospection.cmake ++++ b/cmake/modules/GObjectIntrospection.cmake +@@ -20,6 +20,9 @@ if(ENABLE_INTROSPECTION) + pkg_check_variable(G_IR_SCANNER gobject-introspection-1.0 g_ir_scanner) + pkg_check_variable(G_IR_COMPILER gobject-introspection-1.0 g_ir_compiler) + ++ string(CONCAT G_IR_SCANNER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_SCANNER}") ++ string(CONCAT G_IR_COMPILER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_COMPILER}") ++ + if(NOT G_IR_SCANNER) + message(FATAL_ERROR "g-ir-scanner not provided by gobject-introspection-1.0, you can disable GObject introspection by -DENABLE_INTROSPECTION=OFF") + endif(NOT G_IR_SCANNER) +@@ -116,7 +119,7 @@ macro(gir_add_introspection gir) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}") + + add_custom_command( +- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS= ++ COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=${INTROSPECTION_SCANNER_LDFLAGS} + ${INTROSPECTION_SCANNER_ENV} + ${G_IR_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} +@@ -186,6 +189,7 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver + unset(INTROSPECTION_SCANNER_ARGS) + unset(INTROSPECTION_SCANNER_ENV) + unset(INTROSPECTION_COMPILER_ARGS) ++ unset(INTROSPECTION_SCANNER_LDFLAGS) + + set(${gir_vars_prefix} ${gir_library}) + set(${gir_vars_prefix}_SCANNERFLAGS "--warn-all") +@@ -223,12 +227,12 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver + --add-include-path=${CMAKE_CURRENT_SOURCE_DIR} + --library-path=${CMAKE_BINARY_DIR} + --library-path=${CMAKE_BINARY_DIR}/src ++ --library-path=${CMAKE_BINARY_DIR}/src/private + --library-path=${CMAKE_CURRENT_BINARY_DIR} + ${_gir_extra_libdirs} + ${_gir_identifies_prefixes} + ${_gir_deps} + --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0 +- --library-path=${LIB_INSTALL_DIR} + ${_extra_library_path} + --pkg-export ${pkg_export_prefix}-${gir_library_version} + --c-include=${c_include} +@@ -279,6 +283,10 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver + ) + endif(UNIX) + ++ _gir_list_prefix(_gir_scanner_ldflags ${gir_extra_libdirs_var} "-Wl,-rpath-link=") ++ string(REPLACE ";" " " _gir_scanner_ldflags "${_gir_scanner_ldflags}") ++ set(INTROSPECTION_SCANNER_LDFLAGS "${_gir_scanner_ldflags}") ++ + set(INTROSPECTION_SCANNER_ENV + ${_loader_library_path_var}="${_extra_loader_library_path_native}" + ) +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb deleted file mode 100644 index 1949fc7fd..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb +++ /dev/null @@ -1,132 +0,0 @@ -SUMMARY = "Evolution database backend server" -HOMEPAGE = "http://www.gnome.org/projects/evolution/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ - file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ - file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \ - file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196" - -DEPENDS = " \ - intltool-native gperf-native \ - glib-2.0 gtk+3 gconf libgnome-keyring libgdata \ - dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ -" - -inherit distro_features_check gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ - file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ - file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ - file://iconv-detect.h \ - file://0004-Use-recommended-way-to-handle-the-icu-namespace.patch \ - " -SRC_URI[archive.md5sum] = "ae7bbf543b2c3ff79af27e0edea5d472" -SRC_URI[archive.sha256sum] = "e43aa1847ddc02965f560261ef88d18fb8704eddaa55555bf96b884a33e510ec" - -LKSTRFTIME = "HAVE_LKSTRFTIME=ON" -LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" - -EXTRA_OECMAKE = " \ - -DWITH_KRB5=OFF \ - -DENABLE_GOA=OFF \ - -DENABLE_UOA=OFF \ - -DENABLE_GOOGLE_AUTH=OFF \ - -DENABLE_WEATHER=OFF \ - -D${LKSTRFTIME} \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" - -EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \ - --disable-nntp --disable-gtk-doc" - -# -ldb needs this on some platforms -LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" - -do_configure_append () { - cp ${WORKDIR}/iconv-detect.h ${S}/src - - # fix native perl shebang - sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard -} - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" -} - - -PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ - libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ - libedataserver libedataserver-dev \ - libedataserverui libedataserverui-dev" - -FILES_${PN} =+ "${systemd_user_unitdir} \ - ${datadir}/dbus-1 \ - ${datadir}/evolution-data-server-*/ui/" -RDEPENDS_${PN} += "perl" - -FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" -FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \ - ${libdir}/evolution-data-server*/calendar-backends/.debug \ - ${libdir}/evolution-data-server*/addressbook-backends/.debug \ - ${libdir}/evolution-data-server*/extensions/.debug/" - -RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" - -FILES_libcamel = "${libdir}/libcamel-*.so.* \ - ${libdir}/libcamel-provider-*.so.* \ - ${libdir}/evolution-data-server*/camel-providers/*.so \ - ${libdir}/evolution-data-server*/camel-providers/*.urls" -FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ - ${libdir}/pkgconfig/camel*pc \ - ${libdir}/evolution-data-server*/camel-providers/*.la \ - ${includedir}/evolution-data-server*/camel" - -FILES_libebook = "${libdir}/libebook-*.so.*" -FILES_libebook-dev = "${libdir}/libebook-1.2.so \ - ${libdir}/pkgconfig/libebook-*.pc \ - ${includedir}/evolution-data-server*/libebook/*.h" -RRECOMMENDS_libebook = "libedata-book" - -FILES_libecal = "${libdir}/libecal-*.so.* \ - ${datadir}/evolution-data-server-1.4/zoneinfo" -FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ - ${includedir}/evolution-data-server*/libecal/*.h \ - ${includedir}/evolution-data-server*/libical/*.h" -RRECOMMENDS_libecal = "libedata-cal tzdata" - -FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ - ${datadir}/dbus-1/services/*.AddressBook.service \ - ${libdir}/libedata-book-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libebook*.so \ - ${datadir}/evolution-data-server-1.4/weather/Locations.xml" -FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ - ${libdir}/pkgconfig/libedata-book-*.pc \ - ${libdir}/evolution-data-server-*/extensions/libebook*.la \ - ${includedir}/evolution-data-server-*/libedata-book" - -FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ - ${datadir}/dbus-1/services/*.Calendar.service \ - ${libdir}/libedata-cal-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libecal*.so" -FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ - ${libdir}/pkgconfig/libedata-cal-*.pc \ - ${includedir}/evolution-data-server-*/libedata-cal \ - ${libdir}/evolution-data-server-*/extensions/libecal*.la" - -FILES_libedataserver = "${libdir}/libedataserver-*.so.*" -FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ - ${libdir}/pkgconfig/libedataserver-*.pc \ - ${includedir}/evolution-data-server-*/libedataserver/*.h" - -FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade" -FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ - ${libdir}/pkgconfig/libedataserverui-*.pc \ - ${includedir}/evolution-data-server-*/libedataserverui/*.h" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb new file mode 100644 index 000000000..429dd53d8 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb @@ -0,0 +1,155 @@ +SUMMARY = "Evolution database backend server" +HOMEPAGE = "http://www.gnome.org/projects/evolution/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2 & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ + file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ + file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \ + file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196" + +DEPENDS = " \ + intltool-native gperf-native glib-2.0-native \ + glib-2.0 gtk+3 libgnome-keyring libgdata libcanberra icu \ + dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ +" + +inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative upstream-version-is-even vala + +SRC_URI += "file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ + file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ + file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ + file://0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch \ + file://0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch \ + file://0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch \ + file://0007-Modify-gobject-intrispection-support-to-work-with-OE.patch \ + file://iconv-detect.h \ + " +SRC_URI[archive.md5sum] = "57820f3f88fc554e1a58665a52e12c05" +SRC_URI[archive.sha256sum] = "83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f" + +LKSTRFTIME = "HAVE_LKSTRFTIME=ON" +LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" + +EXTRA_OECMAKE = " \ + -D${LKSTRFTIME} \ + -DSYSCONF_INSTALL_DIR=${sysconfdir} \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" + +PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection', '', d)}" +PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" +PACKAGECONFIG[oauth2] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,json-glib webkitgtk" +PACKAGECONFIG[mitkrb5] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" +PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" +PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather" +PACKAGECONFIG[phonenumber] = "-DWITH_PHONENUMBER=ON,-DWITH_PHONENUMBER=OFF,libphonenumber" +PACKAGECONFIG[introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF" +PACKAGECONFIG[vala] = "-DENABLE_VALA_BINDINGS=ON -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen,-DENABLE_VALA_BINDINGS=OFF" + +# -ldb needs this on some platforms +LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" + +do_configure_append () { + cp ${WORKDIR}/iconv-detect.h ${S}/src + + # fix native perl shebang + sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard +} + +do_compile_prepend() { + # CMake does not support building native binaries when cross compiling. As result + # it always cross compiles them for the target and then aborts when they fail to run. + # To work around this manually build required tools and patch cmake targets to use + # those native binaries we built here. + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} ${S}/src/camel/camel-gen-tables.c \ + -o ${B}/src/camel/camel-gen-tables-native + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} $(pkg-config-native --cflags glib-2.0) \ + ${S}/src/addressbook/libebook-contacts/gen-western-table.c \ + -o ${B}/src/addressbook/libebook-contacts/gen-western-table-native \ + $(pkg-config-native --libs glib-2.0) +} + + +PACKAGES =+ "libebook-contacts libebook-contacts-dev \ + libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ + libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ + libedataserver libedataserver-dev \ + libedataserverui libedataserverui-dev" + +FILES_${PN} =+ "${systemd_user_unitdir} \ + ${datadir}/dbus-1 \ + ${datadir}/evolution-data-server-*/ui/" +RDEPENDS_${PN} += "perl" + +FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" +FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \ + ${libdir}/evolution-data-server*/calendar-backends/.debug \ + ${libdir}/evolution-data-server*/addressbook-backends/.debug \ + ${libdir}/evolution-data-server*/extensions/.debug/" + +RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" + +FILES_libcamel = "${libdir}/libcamel-*.so.* \ + ${libdir}/libcamel-provider-*.so.* \ + ${libdir}/girepository-*/Camel-*.typelib \ + ${libdir}/evolution-data-server*/camel-providers/*.so \ + ${libdir}/evolution-data-server*/camel-providers/*.urls" +FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ + ${libdir}/pkgconfig/camel*pc \ + ${includedir}/evolution-data-server*/camel \ + ${datadir}/vala/vapi/camel-* \ + ${datadir}/gir-*/Camel-*.gir" + +FILES_libebook = "${libdir}/libebook-*.so.* \ + ${libdir}/girepository-*/EBook-*.typelib" +FILES_libebook-dev = "${libdir}/libebook-*.so \ + ${libdir}/pkgconfig/libebook-*.pc \ + ${datadir}/gir-*/EBook-*.gir \ + ${datadir}/vala/vapi/libebook-*.* \ + ${includedir}/evolution-data-server*/libebook/*.h" +RRECOMMENDS_libebook = "libedata-book" + +FILES_libebook-contacts = "${libdir}/libebook-contacts-*.so.* \ + ${libdir}/girepository-*/EBookContacts-*.typelib" +FILES_libebook-contacts-dev = "${libdir}/libebook-contacts-*.so \ + ${libdir}/pkgconfig/libebook-contacts-*.pc \ + ${datadir}/gir-*/EBookContacts-*.gir \ + ${datadir}/vala/vapi/libebook-contacts-* \ + ${includedir}/evolution-data-server*/libebook-contacts/*.h" + +FILES_libecal = "${libdir}/libecal-*.so.*" +FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ + ${includedir}/evolution-data-server*/libecal/*.h \ + ${includedir}/evolution-data-server*/libical/*.h" +RRECOMMENDS_libecal = "libedata-cal tzdata" + +FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ + ${datadir}/dbus-1/services/*.AddressBook.service \ + ${libdir}/libedata-book-*.so.* \ + ${libdir}/evolution-data-server-*/extensions/libebook*.so" +FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ + ${libdir}/pkgconfig/libedata-book-*.pc \ + ${includedir}/evolution-data-server-*/libedata-book" + +FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ + ${datadir}/dbus-1/services/*.Calendar.service \ + ${libdir}/libedata-cal-*.so.* \ + ${libdir}/evolution-data-server-*/extensions/libecal*.so" +FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ + ${libdir}/pkgconfig/libedata-cal-*.pc \ + ${includedir}/evolution-data-server-*/libedata-cal" + +FILES_libedataserver = "${libdir}/libedataserver-*.so.* \ + ${libdir}/girepository-*/EDataServer-*.typelib" +FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ + ${libdir}/pkgconfig/libedataserver-*.pc \ + ${datadir}/vala/vapi/libedataserver-* \ + ${includedir}/evolution-data-server-*/libedataserver/*.h" + +FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*" +FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ + ${libdir}/pkgconfig/libedataserverui-*.pc \ + ${datadir}/gir-*/EDataServerUI-*.gir \ + ${datadir}/vala/vapi/libedataserverui-* \ + ${includedir}/evolution-data-server-*/libedataserverui/*.h" diff --git a/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb b/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb index 2573eb481..9a686f366 100644 --- a/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb +++ b/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb @@ -1,7 +1,5 @@ SUMMARY = "Initramfs image for kexecboot kernel" DESCRIPTION = "This image provides kexecboot (linux as bootloader) and helpers." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit image diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb index 6d53f48cd..7248147a5 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb @@ -25,7 +25,7 @@ RDEPENDS_${PN} += "dracut" inherit autotools-brokensep ptest -EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'" +EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}' 'PREFIX'=${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}" LIBS_libc-musl = "-lexecinfo" LIBS ?= "" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb index cb4b1b365..b313b110c 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb @@ -25,3 +25,5 @@ SRC_URI = "git://github.com/MycroftAI/mimic.git" inherit autotools S = "${WORKDIR}/git" + +CPPFLAGS_append = " -Wno-error" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb deleted file mode 100644 index d4ebe1769..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "A curses client for the Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" - -inherit meson - -DEPENDS += " \ - boost \ - ncurses \ - libmpdclient \ -" - -PACKAGECONFIG ??= "colors locale mouse nls regex help_screen library_screen search_screen song_screen key_screen lyrics_screen outputs_screen" - -PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" -PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" -PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" -PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" -PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" -PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" -PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" - -PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" -PACKAGECONFIG[library_screen] = "-Dlibrary_screen=true,-Dlibrary_screen=false" -PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" -PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" -PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" -PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" -PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" -PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/ncmpc \ -" -SRCREV = "8e98f89ff07b140e6357dab2a9a9f6432ae0e521" -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb new file mode 100644 index 000000000..0c99c7c69 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb @@ -0,0 +1,37 @@ +SUMMARY = "A curses client for the Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" + +inherit meson + +DEPENDS += " \ + boost \ + ncurses \ + libmpdclient \ +" + +PACKAGECONFIG ??= "colors locale mouse nls regex help_screen library_screen search_screen song_screen key_screen lyrics_screen outputs_screen" + +PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" +PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" +PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" +PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" +PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" +PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" +PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" + +PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" +PACKAGECONFIG[library_screen] = "-Dlibrary_screen=true,-Dlibrary_screen=false" +PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" +PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" +PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" +PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" +PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" +PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/ncmpc \ +" +SRCREV = "79cf9905355f25bc5cc6d5a05d2846d75342f554" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 5c38be31f..7308465b1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -51,7 +51,7 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" +PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index 4fe6893fa..3a27c2c5b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb @@ -40,4 +40,4 @@ inherit autotools-brokensep EXTRA_OEMAKE = "BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" # http://errors.yoctoproject.org/Errors/Details/186972/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.6.bb deleted file mode 100644 index 7c77a16ee..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.6.bb +++ /dev/null @@ -1,329 +0,0 @@ -HOMEPAGE = "https://www.samba.org/" -SECTION = "console/network" - -LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " - -SAMBA_MIRROR = "http://samba.org/samba/ftp" -MIRRORS += "\ -${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ -${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ -" - -SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ - file://smb.conf \ - file://16-do-not-check-xsltproc-manpages.patch \ - file://20-do-not-import-target-module-while-cross-compile.patch \ - file://21-add-config-option-without-valgrind.patch \ - file://netdb_defines.patch \ - file://glibc_only.patch \ - file://iconv-4.7.0.patch \ - file://dnsserver-4.7.0.patch \ - file://smb_conf-4.7.0.patch \ - file://volatiles.03_samba \ - file://0001-waf-add-support-of-cross_compile.patch \ - " -SRC_URI_append_libc-musl = " \ - file://samba-pam.patch \ - file://samba-4.3.9-remove-getpwent_r.patch \ - file://cmocka-uintptr_t.patch \ - file://0001-samba-fix-musl-lib-without-innetgr.patch \ - " - -SRC_URI[md5sum] = "9782cac8ef06049942be5f5c93b954be" -SRC_URI[sha256sum] = "9efbeb52db1203dc779b118f1c48c161e569f7a6af5101e745497ee6296eef42" - -UPSTREAM_CHECK_REGEX = "samba\-(?P4\.10(\.\d+)+).tar.gz" - -inherit systemd waf-samba cpan-base perlnative update-rc.d -# remove default added RDEPENDS on perl -RDEPENDS_${PN}_remove = "perl" - -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam libtasn1 jansson" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" - -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" - -INITSCRIPT_NAME = "samba" -INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." - -SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" -SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" -SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" -SYSTEMD_SERVICE_winbind = "winbind.service" - -# There are prerequisite settings to enable ad-dc, so disable the service by default. -# Reference: -# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller -SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -# Use krb5. Build active domain controller. -# -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl cups ad-dc gnutls ldap mitkrb5 \ -" - -RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" - -PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" -PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[sasl] = ",,cyrus-sasl" -PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" -PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" -PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," -PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" -PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" -PACKAGECONFIG[libunwind] = ", , libunwind" -PACKAGECONFIG[gpgme] = ",--without-gpgme,," -PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," - -# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, -# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: -# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html -# So the working combination is: -# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable -# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable -# -# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where -# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. -# -PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,," -PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," -PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," - -SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" -SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" -SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" -SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" - -# These libraries are supposed to replace others supplied by packages, but decorate the names of -# .so files so there will not be a conflict. This is not done consistantly, so be very careful -# when adding to this list. -# -SAMBA4_LIBS="heimdal,cmocka,NONE" - -EXTRA_OECONF += "--enable-fhs \ - --with-piddir=/run \ - --with-sockets-dir=/run/samba \ - --with-modulesdir=${libdir}/samba \ - --with-lockdir=${localstatedir}/lib/samba \ - --with-cachedir=${localstatedir}/lib/samba \ - --disable-rpath-install \ - --with-shared-modules=${SAMBA4_MODULES} \ - --bundled-libraries=${SAMBA4_LIBS} \ - ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \ - --with-profiling-data \ - --with-libiconv=${STAGING_DIR_HOST}${prefix} \ - --with-pam --with-pammodulesdir=${base_libdir}/security \ - " - -LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -do_install_append() { - for section in 1 5 7; do - install -d ${D}${mandir}/man$section - install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section - done - for section in 1 5 7 8; do - install -d ${D}${mandir}/man$section - install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section - done - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ - sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ - -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ - -i ${D}${systemd_system_unitdir}/*.service - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then - rm -f ${D}${systemd_system_unitdir}/samba.service - fi - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf - echo "d ${localstatedir}/log/samba 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - install -d ${D}${sysconfdir}/init.d - install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba - sed -e 's,/opt/samba/bin,${sbindir},g' \ - -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ - -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ - -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ - -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba - - install -d ${D}${sysconfdir}/samba - echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts - install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba - - install -d ${D}${sysconfdir}/default - install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba - - # the items are from ctdb/tests/run_tests.sh - for d in onnode takeover tool eventscripts cunit simple complex; do - testdir=${D}${datadir}/ctdb-tests/$d - install -d $testdir - cp ${S}/ctdb/tests/$d/*.sh $testdir - cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true - done - - # fix file-rdeps qa warning - if [ -f ${D}${bindir}/onnode ]; then - sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode - fi - - chmod 0750 ${D}${sysconfdir}/sudoers.d - rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log - - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba-gpupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_upgradedns - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_spnupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_kcc - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_dnsupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool - -} - -PACKAGES =+ "${PN}-python3 ${PN}-pidl \ - ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ - winbind \ - ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ - smbclient ${PN}-client ${PN}-server ${PN}-test" - -python samba_populate_packages() { - def module_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN') - d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) - - mlprefix = d.getVar('MLPREFIX') or '' - pam_libdir = d.expand('${base_libdir}/security') - pam_pkgname = mlprefix + 'pam-plugin%s' - do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) - - libdir = d.getVar('libdir') - do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) - pkglibdir = '%s/samba' % libdir - do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) - moduledir = '%s/samba/auth' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) - moduledir = '%s/samba/pdb' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) -} - -PACKAGESPLITFUNCS_prepend = "samba_populate_packages " -PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" - -RDEPENDS_${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" -RDEPENDS_${PN}-python3 += "pytalloc python3-tdb" - -FILES_${PN}-base = "${sbindir}/nmbd \ - ${sbindir}/smbd \ - ${sysconfdir}/init.d \ - ${systemd_system_unitdir}/nmb.service \ - ${systemd_system_unitdir}/smb.service" - -FILES_${PN}-ad-dc = "${sbindir}/samba \ - ${systemd_system_unitdir}/samba.service \ - ${libdir}/krb5/plugins/kdb/samba.so \ -" -RDEPENDS_${PN}-ad-dc = "krb5-kdc" - -FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ - ${bindir}/ctdb_run_cluster_tests \ - ${sysconfdir}/ctdb/nodes \ - ${datadir}/ctdb-tests \ - ${datadir}/ctdb/tests \ - ${localstatedir}/lib/ctdb \ - " - -FILES_${BPN}-common = "${sysconfdir}/default \ - ${sysconfdir}/samba \ - ${sysconfdir}/tmpfiles.d \ - ${localstatedir}/lib/samba \ - ${localstatedir}/spool/samba \ -" - -FILES_${PN} += "${libdir}/vfs/*.so \ - ${libdir}/charset/*.so \ - ${libdir}/*.dat \ - ${libdir}/auth/*.so \ - ${datadir}/ctdb/events/* \ -" - -FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" - -FILES_${PN}-testsuite = "${bindir}/gentest \ - ${bindir}/locktest \ - ${bindir}/masktest \ - ${bindir}/ndrdump \ - ${bindir}/smbtorture" - -FILES_registry-tools = "${bindir}/regdiff \ - ${bindir}/regpatch \ - ${bindir}/regshell \ - ${bindir}/regtree" - -FILES_winbind = "${sbindir}/winbindd \ - ${bindir}/wbinfo \ - ${bindir}/ntlm_auth \ - ${libdir}/samba/idmap \ - ${libdir}/samba/nss_info \ - ${libdir}/winbind_krb5_locator.so \ - ${libdir}/winbind-krb5-localauth.so \ - ${sysconfdir}/init.d/winbind \ - ${systemd_system_unitdir}/winbind.service" - -FILES_${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" - -FILES_smbclient = "${bindir}/cifsdd \ - ${bindir}/rpcclient \ - ${bindir}/smbcacls \ - ${bindir}/smbclient \ - ${bindir}/smbcquotas \ - ${bindir}/smbget \ - ${bindir}/smbspool \ - ${bindir}/smbtar \ - ${bindir}/smbtree \ - ${libdir}/samba/smbspool_krb5_wrapper" - -RDEPENDS_${PN}-pidl_append = " perl" -FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" - -RDEPENDS_${PN}-client = "\ - smbclient \ - winbind \ - registry-tools \ - ${PN}-pidl \ - " - -ALLOW_EMPTY_${PN}-client = "1" - -RDEPENDS_${PN}-server = "\ - ${PN} \ - winbind \ - registry-tools \ - " - -ALLOW_EMPTY_${PN}-server = "1" - -RDEPENDS_${PN}-test = "\ - ${PN}-ctdb-tests \ - ${PN}-testsuite \ - " - -ALLOW_EMPTY_${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb new file mode 100644 index 000000000..d13a6b4db --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb @@ -0,0 +1,329 @@ +HOMEPAGE = "https://www.samba.org/" +SECTION = "console/network" + +LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ + file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " + +SAMBA_MIRROR = "http://samba.org/samba/ftp" +MIRRORS += "\ +${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ +${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ +" + +SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ + file://smb.conf \ + file://16-do-not-check-xsltproc-manpages.patch \ + file://20-do-not-import-target-module-while-cross-compile.patch \ + file://21-add-config-option-without-valgrind.patch \ + file://netdb_defines.patch \ + file://glibc_only.patch \ + file://iconv-4.7.0.patch \ + file://dnsserver-4.7.0.patch \ + file://smb_conf-4.7.0.patch \ + file://volatiles.03_samba \ + file://0001-waf-add-support-of-cross_compile.patch \ + " +SRC_URI_append_libc-musl = " \ + file://samba-pam.patch \ + file://samba-4.3.9-remove-getpwent_r.patch \ + file://cmocka-uintptr_t.patch \ + file://0001-samba-fix-musl-lib-without-innetgr.patch \ + " + +SRC_URI[md5sum] = "05472d0dd943b3ccbc3be5032a9eb563" +SRC_URI[sha256sum] = "34f30494b6b63700f54be22be636e8a6e0430577166a76a017075e11c02a1ebb" + +UPSTREAM_CHECK_REGEX = "samba\-(?P4\.10(\.\d+)+).tar.gz" + +inherit systemd waf-samba cpan-base perlnative update-rc.d +# remove default added RDEPENDS on perl +RDEPENDS_${PN}_remove = "perl" + +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam libtasn1 jansson" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + +INITSCRIPT_NAME = "samba" +INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." + +SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" +SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" +SYSTEMD_SERVICE_winbind = "winbind.service" + +# There are prerequisite settings to enable ad-dc, so disable the service by default. +# Reference: +# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller +SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +# Use krb5. Build active domain controller. +# +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ + acl cups ad-dc gnutls ldap mitkrb5 \ +" + +RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" + +PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" +PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[sasl] = ",,cyrus-sasl" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" +PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," +PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" +PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libunwind] = ", , libunwind" +PACKAGECONFIG[gpgme] = ",--without-gpgme,," +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," + +# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, +# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: +# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html +# So the working combination is: +# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable +# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable +# +# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where +# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. +# +PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,," +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," +PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," + +SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" +SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" +SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" +SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" + +# These libraries are supposed to replace others supplied by packages, but decorate the names of +# .so files so there will not be a conflict. This is not done consistantly, so be very careful +# when adding to this list. +# +SAMBA4_LIBS="heimdal,cmocka,NONE" + +EXTRA_OECONF += "--enable-fhs \ + --with-piddir=/run \ + --with-sockets-dir=/run/samba \ + --with-modulesdir=${libdir}/samba \ + --with-lockdir=${localstatedir}/lib/samba \ + --with-cachedir=${localstatedir}/lib/samba \ + --disable-rpath-install \ + --with-shared-modules=${SAMBA4_MODULES} \ + --bundled-libraries=${SAMBA4_LIBS} \ + ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ + --with-cluster-support \ + --with-profiling-data \ + --with-libiconv=${STAGING_DIR_HOST}${prefix} \ + --with-pam --with-pammodulesdir=${base_libdir}/security \ + " + +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +do_install_append() { + for section in 1 5 7; do + install -d ${D}${mandir}/man$section + install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section + done + for section in 1 5 7 8; do + install -d ${D}${mandir}/man$section + install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section + done + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ + sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ + -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ + -i ${D}${systemd_system_unitdir}/*.service + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then + rm -f ${D}${systemd_system_unitdir}/samba.service + fi + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf + install -d ${D}${sysconfdir}/init.d + install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba + sed -e 's,/opt/samba/bin,${sbindir},g' \ + -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ + -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ + -e 's,/usr/bin,${base_bindir},g' \ + -i ${D}${sysconfdir}/init.d/samba + + install -d ${D}${sysconfdir}/samba + echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts + install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba + + install -d ${D}${sysconfdir}/default + install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba + + # the items are from ctdb/tests/run_tests.sh + for d in onnode takeover tool eventscripts cunit simple complex; do + testdir=${D}${datadir}/ctdb-tests/$d + install -d $testdir + cp ${S}/ctdb/tests/$d/*.sh $testdir + cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true + done + + # fix file-rdeps qa warning + if [ -f ${D}${bindir}/onnode ]; then + sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode + fi + + chmod 0750 ${D}${sysconfdir}/sudoers.d + rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log + + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba-gpupdate + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_upgradedns + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_spnupdate + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_kcc + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_dnsupdate + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool + +} + +PACKAGES =+ "${PN}-python3 ${PN}-pidl \ + ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ + winbind \ + ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ + smbclient ${PN}-client ${PN}-server ${PN}-test" + +python samba_populate_packages() { + def module_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN') + d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) + + mlprefix = d.getVar('MLPREFIX') or '' + pam_libdir = d.expand('${base_libdir}/security') + pam_pkgname = mlprefix + 'pam-plugin%s' + do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) + + libdir = d.getVar('libdir') + do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) + pkglibdir = '%s/samba' % libdir + do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) + moduledir = '%s/samba/auth' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) + moduledir = '%s/samba/pdb' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) +} + +PACKAGESPLITFUNCS_prepend = "samba_populate_packages " +PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" + +RDEPENDS_${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" +RDEPENDS_${PN}-python3 += "pytalloc python3-tdb" + +FILES_${PN}-base = "${sbindir}/nmbd \ + ${sbindir}/smbd \ + ${sysconfdir}/init.d \ + ${systemd_system_unitdir}/nmb.service \ + ${systemd_system_unitdir}/smb.service" + +FILES_${PN}-ad-dc = "${sbindir}/samba \ + ${systemd_system_unitdir}/samba.service \ + ${libdir}/krb5/plugins/kdb/samba.so \ +" +RDEPENDS_${PN}-ad-dc = "krb5-kdc" + +FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ + ${bindir}/ctdb_run_cluster_tests \ + ${sysconfdir}/ctdb/nodes \ + ${datadir}/ctdb-tests \ + ${datadir}/ctdb/tests \ + ${localstatedir}/lib/ctdb \ + " + +FILES_${BPN}-common = "${sysconfdir}/default \ + ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ + ${localstatedir}/lib/samba \ + ${localstatedir}/spool/samba \ +" + +FILES_${PN} += "${libdir}/vfs/*.so \ + ${libdir}/charset/*.so \ + ${libdir}/*.dat \ + ${libdir}/auth/*.so \ + ${datadir}/ctdb/events/* \ +" + +FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" + +FILES_${PN}-testsuite = "${bindir}/gentest \ + ${bindir}/locktest \ + ${bindir}/masktest \ + ${bindir}/ndrdump \ + ${bindir}/smbtorture" + +FILES_registry-tools = "${bindir}/regdiff \ + ${bindir}/regpatch \ + ${bindir}/regshell \ + ${bindir}/regtree" + +FILES_winbind = "${sbindir}/winbindd \ + ${bindir}/wbinfo \ + ${bindir}/ntlm_auth \ + ${libdir}/samba/idmap \ + ${libdir}/samba/nss_info \ + ${libdir}/winbind_krb5_locator.so \ + ${libdir}/winbind-krb5-localauth.so \ + ${sysconfdir}/init.d/winbind \ + ${systemd_system_unitdir}/winbind.service" + +FILES_${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +FILES_smbclient = "${bindir}/cifsdd \ + ${bindir}/rpcclient \ + ${bindir}/smbcacls \ + ${bindir}/smbclient \ + ${bindir}/smbcquotas \ + ${bindir}/smbget \ + ${bindir}/smbspool \ + ${bindir}/smbtar \ + ${bindir}/smbtree \ + ${libdir}/samba/smbspool_krb5_wrapper" + +RDEPENDS_${PN}-pidl_append = " perl" +FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" + +RDEPENDS_${PN}-client = "\ + smbclient \ + winbind \ + registry-tools \ + ${PN}-pidl \ + " + +ALLOW_EMPTY_${PN}-client = "1" + +RDEPENDS_${PN}-server = "\ + ${PN} \ + winbind \ + registry-tools \ + " + +ALLOW_EMPTY_${PN}-server = "1" + +RDEPENDS_${PN}-test = "\ + ${PN}-ctdb-tests \ + ${PN}-testsuite \ + " + +ALLOW_EMPTY_${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb index e466cc232..3df6824ff 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb @@ -69,4 +69,4 @@ INSANE_SKIP_${PN} = "dev-so" RDEPENDS_${PN} += "bash python" # http://errors.yoctoproject.org/Errors/Details/186970/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.1.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.1.bb deleted file mode 100644 index 9d0da33e3..000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Netfilter Tables userspace utillites" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" - -DEPENDS = "libmnl libnftnl readline gmp bison-native" - -UPSTREAM_CHECK_URI = "https://www.netfilter.org/projects/nftables/files/" - -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[md5sum] = "e2facbcad6c5d9bd87a0bf5081a31522" -SRC_URI[sha256sum] = "ead3bb68ed540bfbb87a96f2b69c3d65ab0c2a0c3f6e739a395c09377d1b4fce" - -inherit autotools manpages pkgconfig - -PACKAGECONFIG ?= "python" -PACKAGECONFIG[man] = "--enable--man-doc, --disable-man-doc" -PACKAGECONFIG[python] = "--with-python-bin=${PYTHON}, --with-python-bin="", python3" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} - -ASNEEDED = "" - -RRECOMMENDS_${PN} += "kernel-module-nf-tables" - -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${libdir_native}/${PYTHON_DIR}" -RDEPENDS_${PN}-python = "python3-core python3-json" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.2.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.2.bb new file mode 100644 index 000000000..98e8050b8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "Netfilter Tables userspace utillites" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" + +DEPENDS = "libmnl libnftnl readline gmp bison-native" + +UPSTREAM_CHECK_URI = "https://www.netfilter.org/projects/nftables/files/" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" +SRC_URI[md5sum] = "dfe130724d7c998eb26b56447e932899" +SRC_URI[sha256sum] = "5cb66180143e6bfc774f4eb316206d40ac1cb6df269a90882404cbf7165513f5" + +inherit autotools manpages pkgconfig + +PACKAGECONFIG ?= "python" +PACKAGECONFIG[man] = "--enable--man-doc, --disable-man-doc" +PACKAGECONFIG[python] = "--with-python-bin=${PYTHON}, --with-python-bin="", python3" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} + +ASNEEDED = "" + +RRECOMMENDS_${PN} += "kernel-module-nf-tables" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${libdir_native}/${PYTHON_DIR}" +RDEPENDS_${PN}-python = "python3-core python3-json" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb index 6f203c5a8..a6716d06c 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb @@ -103,6 +103,3 @@ RPROVIDES_${PN}-server = "rshd" RDEPENDS_${PN}-server = "xinetd" RDEPENDS_${PN}-server += "tcp-wrappers" - -# http://errors.yoctoproject.org/Errors/Details/186963/ -EXCLUDE_FROM_WORLD_libc-musl = "1" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb index 296ebcad2..716794f44 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb @@ -68,4 +68,4 @@ FILES_${PN}-dbg = "${prefix}/src/debug \ RDEPENDS_${PN}-server += "tcp-wrappers xinetd rpcbind" # http://errors.yoctoproject.org/Errors/Details/186962/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb index 4b035af36..a8d98c940 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb @@ -62,5 +62,5 @@ SRC_URI[sha256sum] = "9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2b FILES_${PN} += "${sbindir}/in.* ${libdir}/* ${sysconfdir}/xinetd.d/*" # http://errors.yoctoproject.org/Errors/Details/186954/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' RCONFLICTS_${PN} = "inetutils-telnetd" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch new file mode 100644 index 000000000..844a70985 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch @@ -0,0 +1,31 @@ +From 52f4b58c14a2788ca08b7d8884d586724d86fc66 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Mon, 19 Aug 2019 14:46:02 +0000 +Subject: [PATCH] dnsmasq: fix build against 5.2 headers + +Upstream linux y2038 work has moved some definitions SIOCGSTAMP is +defined in linux/sockios.h, not asm/sockios.h now. So we need to +add that include to fix the build. + +Upstream-status: backport of http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=3052ce208acf602f0163166dcefb7330d537cedb + +Signed-off-by: Bruce Ashfield +--- + a/src/dnsmasq.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h b/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h +index f53e9a5be6..d9225ea473 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -138,6 +138,7 @@ typedef unsigned long long u64; + #endif + + #if defined(HAVE_LINUX_NETWORK) ++#include + #include + /* There doesn't seem to be a universally-available + userspace header for these. */ +-- +2.19.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb index fdbdefbad..6f3d5daa6 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb @@ -4,5 +4,6 @@ SRC_URI[dnsmasq-2.80.md5sum] = "1f071fd11454e1cffea73bdadcf70b21" SRC_URI[dnsmasq-2.80.sha256sum] = "9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc" SRC_URI += "\ file://lua.patch \ + file://0001-dnsmasq-fix-build-against-5.2-headers.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.18-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.18-1.bb deleted file mode 100644 index 6fb621a1f..000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.18-1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Distributed block device driver for Linux" -DESCRIPTION = "DRBD is a block device which is designed to build high \ - availability clusters. This is done by mirroring a whole \ - block device via (a dedicated) network. You could see \ - it as a network raid-1." -HOMEPAGE = "http://oss.linbit.com/drbd/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" -DEPENDS = "virtual/kernel" - -SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ - file://check_existence_of_modules_before_installing.patch \ - " - -SRC_URI[md5sum] = "f2e6eaa92861252af0b564f0100f1859" -SRC_URI[sha256sum] = "d6b4188ed01d8555c78b04b5e31532d5990ca98bf063230f3e949ee8a7338d58" - -inherit module - -EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}'" - -do_install () { - oe_runmake install DESTDIR="${D}" -} diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb new file mode 100644 index 000000000..6683781af --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb @@ -0,0 +1,23 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD is a block device which is designed to build high \ + availability clusters. This is done by mirroring a whole \ + block device via (a dedicated) network. You could see \ + it as a network raid-1." +HOMEPAGE = "http://oss.linbit.com/drbd/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" +DEPENDS = "virtual/kernel" + +SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ + file://check_existence_of_modules_before_installing.patch \ + " +SRC_URI[md5sum] = "bd1202eaaf81641752d0c9b003b10f6c" +SRC_URI[sha256sum] = "5b3d2bcb99542940e40af903dea783cf04524e9f41cc530e210d2c15ef84fa58" + +inherit module + +EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}'" + +do_install () { + oe_runmake install DESTDIR="${D}" +} diff --git a/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch new file mode 100644 index 000000000..246910036 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch @@ -0,0 +1,15 @@ +Description: Correct typo: s/ommited/omitted/ +Author: Michael Shuler +Index: ifmetric/man/ifmetric.8 +=================================================================== +--- ifmetric.orig/man/ifmetric.8 ++++ ifmetric/man/ifmetric.8 +@@ -9,7 +9,7 @@ ifmetric is a Linux tool for setting the + + ifmetric uses the Linux NETLINK interface to manipulate the routes. Because of that it is compatible with routes created with the new iproute2 utility. + .SH OPTIONS +-You should specify the interface name as first parameter. The second parameter should be the new metric. If ommited the metric 0 (highest) is used. ++You should specify the interface name as first parameter. The second parameter should be the new metric. If omitted the metric 0 (highest) is used. + .SH RETURN VALUES + \fI0\f1 Success + diff --git a/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch new file mode 100644 index 000000000..374135d4f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch @@ -0,0 +1,16 @@ +Description: Fix "NETLINK: Error: Invalid argument" for links that are down, in kernel 4.4+ +Author: Jim Paris +Bug-Debian: http://bugs.debian.org/864889 +Index: ifmetric/src/nlrequest.c +=================================================================== +--- a/src/ifmetric.c ++++ b/src/ifmetric.c +@@ -97,6 +97,8 @@ + l = NLMSG_PAYLOAD(n, sizeof(struct rtmsg)); + a = RTM_RTA(r); + ++ r->rtm_flags &= ~(RTNH_F_DEAD | RTNH_F_LINKDOWN); ++ + while(RTA_OK(a, l)) { + switch(a->rta_type) { + case RTA_PRIORITY: diff --git a/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch new file mode 100644 index 000000000..992f7d2fb --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch @@ -0,0 +1,24 @@ +Description: Correct spelling-error-in-binary s/Recieved/Received/ +Author: Michael Shuler +Index: ifmetric/src/ifmetric.c +=================================================================== +--- ifmetric.orig/src/ifmetric.c 2013-09-04 18:37:59.000000000 -0500 ++++ ifmetric/src/ifmetric.c 2013-09-04 19:08:38.539750778 -0500 +@@ -38,7 +38,7 @@ + case RTA_OIF: + + if (RTA_PAYLOAD(a) != sizeof(int)) { +- fprintf(stderr, "NETLINK: Recieved corrupt RTA_OIF payload.\n"); ++ fprintf(stderr, "NETLINK: Received corrupt RTA_OIF payload.\n"); + return -1; + } + +@@ -102,7 +102,7 @@ + case RTA_PRIORITY: + + if (RTA_PAYLOAD(a) != sizeof(int)) { +- fprintf(stderr, "NETLINK: Recieved corrupt RTA_PRIORITY payload.\n"); ++ fprintf(stderr, "NETLINK: Received corrupt RTA_PRIORITY payload.\n"); + return NULL; + } + diff --git a/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch new file mode 100644 index 000000000..15b310333 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch @@ -0,0 +1,16 @@ +Description: Fix "NETLINK: Packet too small or truncated!" error. +Author: Benedek László +Bug-Debian: http://bugs.debian.org/514197 +Index: ifmetric/src/nlrequest.c +=================================================================== +--- ifmetric.orig/src/nlrequest.c 2013-09-05 14:10:42.000000000 -0500 ++++ ifmetric/src/nlrequest.c 2013-09-05 14:19:06.573420862 -0500 +@@ -44,7 +44,7 @@ + + for (;;) { + int bytes; +- char replybuf[2048]; ++ char replybuf[4096]; + struct nlmsghdr *p = (struct nlmsghdr *) replybuf; + + if ((bytes = recv(s, &replybuf, sizeof(replybuf), 0)) < 0) { diff --git a/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb new file mode 100644 index 000000000..4ee7c42a3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Set routing metrics for a network interface" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://0pointer.de/lennart/projects/ifmetric/ifmetric-${PV}.tar.gz \ + file://ifmetric.8_typo.patch \ + file://ifmetric.c_netlink-invalid-arg.patch \ + file://ifmetric.c_typo.patch \ + file://nlrequest.c_packet-too-small_fix.patch" +SRC_URI[md5sum] = "74aa3f5ee8aca16a87e124ddcc64fa36" +SRC_URI[sha256sum] = "0fa8510a4e34e555f136f9df81d26618313f2d69a4880c0fb5967f19502f1aec" + +inherit autotools + +# disable lynx support for now +EXTRA_OECONF = "--disable-lynx" diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb deleted file mode 100644 index d25c3fa65..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "The tdb library" -HOMEPAGE = "http://tdb.samba.org/" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ - file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" - -SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ - file://tdb-Add-configure-options-for-packages.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ -" - -SRC_URI[md5sum] = "d1d0a5d43614add17d1e41bbdb209446" -SRC_URI[sha256sum] = "dd4ecd9678e8d3ea772623bd81fe49b43363a2f970a76fb5468322753787aa4b" - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" - -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -S = "${WORKDIR}/tdb-${PV}" - -inherit waf-samba - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -do_install_append() { - # add this link for cross check python module existence. eg: on x86-64 host, check python module - # under recipe-sysroot which is mips64. - cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so -} - -PACKAGES += "tdb-tools python3-tdb" - -RPROVIDES_${PN}-dbg += "python3-tdb-dbg" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -RDEPENDS_python3-tdb = "python3" -INSANE_SKIP_${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb new file mode 100644 index 000000000..4973e80ca --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb @@ -0,0 +1,57 @@ +SUMMARY = "The tdb library" +HOMEPAGE = "http://tdb.samba.org/" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" + +LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ + file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" + +SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ + file://tdb-Add-configure-options-for-packages.patch \ + file://0001-waf-add-support-of-cross_compile.patch \ +" + +SRC_URI[md5sum] = "b2c05ad68334368d3258a63db709f254" +SRC_URI[sha256sum] = "9040b2cce4028e392f063f91bbe76b8b28fecc2b7c0c6071c67b5eb3168e004a" + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" + +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +S = "${WORKDIR}/tdb-${PV}" + +inherit waf-samba + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +do_install_append() { + # add this link for cross check python module existence. eg: on x86-64 host, check python module + # under recipe-sysroot which is mips64. + cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so +} + +PACKAGES += "tdb-tools python3-tdb" + +RPROVIDES_${PN}-dbg += "python3-tdb-dbg" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_tdb-tools = "${bindir}/*" +FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +RDEPENDS_python3-tdb = "python3" +INSANE_SKIP_${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch new file mode 100644 index 000000000..a54869db8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch @@ -0,0 +1,59 @@ +From 4456e13880803a300e4b6f263ad22a37481b5df5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 09:33:43 -0700 +Subject: [PATCH] saaldump,atmdump: Include linux/sockios.h for SIOCGSTAMP + +In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 +the asm-generic/sockios.h header no longer defines SIOCGSTAMP. +Instead it provides only SIOCGSTAMP_OLD. + +The linux/sockios.h header now defines SIOCGSTAMP using either +SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only +header file is not pulled so we get a build failure. + +Fixes +../../../linux-atm-2.5.2/src/maint/atmdump.c:142:18: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +1 error generated. +make[3]: *** [Makefile:623: atmdump.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +../../../linux-atm-2.5.2/src/maint/saaldump.c:169:14: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/maint/atmdump.c | 2 +- + src/maint/saaldump.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/maint/atmdump.c b/src/maint/atmdump.c +index 8b17826..9e4853b 100644 +--- a/src/maint/atmdump.c ++++ b/src/maint/atmdump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include + #endif +- ++#include + #include + #include + #include +diff --git a/src/maint/saaldump.c b/src/maint/saaldump.c +index 83bdde9..69429a8 100644 +--- a/src/maint/saaldump.c ++++ b/src/maint/saaldump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include + #endif +- ++#include + #include + #include + #include +-- +2.23.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 9ed7ca613..e594906c3 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -12,6 +12,7 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P file://0001-ttcp-Add-printf-format-string.patch \ file://0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch \ file://0001-IFNAMSIZ-is-defined-in-net-if.h.patch \ + file://0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch \ " SRC_URI_append_libc-musl = " file://musl-no-on_exit.patch" diff --git a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb index a4a9c91c6..0f49d6060 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb @@ -14,7 +14,9 @@ SRC_URI = "git://pagure.io/netcf.git;protocol=https \ UPSTREAM_CHECK_GITTAGREGEX = "release-(?P(\d+(\.\d+)+))" -DEPENDS += "augeas libnl libxslt libxml2 gnulib" +DEPENDS += "augeas libnl libxslt libxml2" + +do_configure[depends] += "gnulib:do_populate_sysroot" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 4ddef29a3..e48fabdf0 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -33,6 +33,8 @@ LAYERSERIES_COMPAT_openembedded-layer = "thud warrior" LICENSE_PATH += "${LAYERDIR}/licenses" +PREFERRED_RPROVIDER_libdevmapper = "lvm2" + SIGGEN_EXCLUDERECIPES_ABISAFE += " \ mplayer-common \ fbset-modes \ @@ -49,7 +51,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->bash \ phoronix-test-suite->python \ phoronix-test-suite->php \ - phoronix-test-suite->lsb \ + phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ phoronix-test-suite->busybox \ " 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 index 873384496..c4df1a90b 100644 --- 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 @@ -29,7 +29,7 @@ do_install() { 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" +RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb-release" FILES_${PN} += " \ ${datadir}/phoronix-test-suite \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb index 50620d99e..fcabeb902 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb @@ -28,3 +28,5 @@ EXTRA_OECMAKE += " \ PACKAGES =+ "${PN}-testapps" FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*" + +CFLAGS_append = " -Wno-error" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb deleted file mode 100644 index 1e5094bd1..000000000 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.58.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "C++ bindings for the glib library" -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ - file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" -inherit gnomebase - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -SRC_URI += " \ - file://remove-examples.patch \ -" -SRC_URI[archive.md5sum] = "77f1016cbb27e15d4e04a2b7bfdb4cae" -SRC_URI[archive.sha256sum] = "6e5fe03bdf1e220eeffd543e017fd2fb15bcec9235f0ffd50674aff9362a85f0" - -do_install_append() { - install -d ${D}${datadir}/glibmm-2.4 - install -d ${D}${datadir}/aclocal - - install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/ - install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true - - for i in generate_wrap_init.pl gmmproc; do - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i - done -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" - -RDEPENDS_${PN}-dev = "perl" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb new file mode 100644 index 000000000..7163212b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "C++ bindings for the glib library" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" +inherit gnomebase + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI += " \ + file://remove-examples.patch \ +" +SRC_URI[archive.md5sum] = "0f6180d185c067bdb2aa30d035f9b867" +SRC_URI[archive.sha256sum] = "a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc" + +do_install_append() { + install -d ${D}${datadir}/glibmm-2.4 + install -d ${D}${datadir}/aclocal + + install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/ + install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true + + for i in generate_wrap_init.pl gmmproc; do + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i + done +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" + +RDEPENDS_${PN}-dev = "perl" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.1.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.1.bb deleted file mode 100644 index 62054a116..000000000 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A library for loose coupling of C++ method calls" -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" - -DEPENDS = "mm-common" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" -SRC_URI[md5sum] = "549cffbdb72fa105b782756f2713ffc7" -SRC_URI[sha256sum] = "c9a25f26178c6cbb147f9904d8c533b5a5c5111a41ac2eb781eb734eea446003" - -S = "${WORKDIR}/libsigc++-${PV}" - -inherit autotools - -EXTRA_AUTORECONF = "--exclude=autoheader" - -FILES_${PN}-dev += "${libdir}/sigc++-*/" -FILES_${PN}-doc += "${datadir}/devhelp" - -BBCLASSEXTEND = "native" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.2.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.2.bb new file mode 100644 index 000000000..0e5b9ceeb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "A library for loose coupling of C++ method calls" +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +DEPENDS = "mm-common" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" +SRC_URI[md5sum] = "1b067bfae0b502e6a5127336cb09d2dd" +SRC_URI[sha256sum] = "b1ca0253379596f9c19f070c83d362b12dfd39c0a3ea1dd813e8e21c1a097a98" + +S = "${WORKDIR}/libsigc++-${PV}" + +inherit autotools + +FILES_${PN}-dev += "${libdir}/sigc++-*/" +FILES_${PN}-doc += "${datadir}/devhelp" + +BBCLASSEXTEND = "native" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb index 54b59ccb7..2da9118af 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb @@ -2,8 +2,6 @@ # Please communicate your use cases and suggestions to the mailinglist(s) SUMMARY = "Basic task to get a device online" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" PR = "r13" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb index 3ae7a49fe..b5e7b99cc 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb @@ -1,6 +1,4 @@ SUMMARY = "Basic task to get a device booting" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" PR = "r58" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb index 6ebf1e279..07736711f 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb @@ -16,6 +16,10 @@ DEPENDS = " \ util-linux \ " +RDEPENDS_${PN} = " \ + libdevmapper \ +" + SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" SRC_URI[md5sum] = "f7818082056e5bc0be12e4c7fc20345a" SRC_URI[sha256sum] = "9d8f8cac2836a1623c075b5cba96032271dc81a28b2aa27fbd8331e831416bb1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index d84fcaecc..34b0b7a3b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378 \ + file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " DEPENDS = "libbsd libpcre zlib libcap" diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 5f9a72e0a..06f3ee87d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -42,7 +42,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \ file://0001-disable-calls-to-getcontext-with-musl.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ - file://dont-clobber-rsp.patch \ + file://dont-clobber-rsp.patch;patchdir=src/third_party/lss;striplevel=4 \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb index 53fc159c8..4bd9a1255 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb @@ -1,6 +1,4 @@ SUMMARY = "Packages required for a target (on-device) SDK" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" PR = "r1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb new file mode 100644 index 000000000..ad45f87ec --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.9.bb @@ -0,0 +1,20 @@ +SUMMARY = "Light-weight C++ XML Processing Library" +DESCRIPTION = "pugixml is a C++ XML processing library, which consists of a \ +DOM-like interface with rich traversal/modification capabilities, \ +an extremely fast XML parser which constructs the DOM tree from \ +n XML file/buffer, and an XPath 1.0 implementation for complex \ +data-driven tree queries." +HOMPAGE = "https://pugixml.org/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=1d569c2ed59c94ddd9586051f8c67da6" + +SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[md5sum] = "7286ee2ed11376b6b780ced19fae0b64" +SRC_URI[sha256sum] = "d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + " diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb deleted file mode 100644 index 3ee945fc9..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The concurrent.futures module provides a high-level interface for asynchronously executing callables." -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=834d982f973c48b6d662b5944c5ab567" -HOMEPAGE = "https://github.com/agronholm/pythonfutures" -DEPENDS = "python" - -SRC_URI[md5sum] = "d1b299a06b96ccb59f70324716dc0016" -SRC_URI[sha256sum] = "9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265" - -inherit pypi setuptools - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb new file mode 100644 index 000000000..1636f7371 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.3.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "The concurrent.futures module provides a high-level interface for asynchronously executing callables." +SECTION = "devel/python" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=834d982f973c48b6d662b5944c5ab567" +HOMEPAGE = "https://github.com/agronholm/pythonfutures" +DEPENDS = "python" + +SRC_URI[md5sum] = "b43a39ae1475e3fd6940f2b4f7214675" +SRC_URI[sha256sum] = "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794" + +inherit pypi setuptools + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch new file mode 100644 index 000000000..d4c776569 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch @@ -0,0 +1,31 @@ +From a47ca75702318ff43446c70120f7aacde4ccee1b Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen +Date: Thu, 20 Jun 2019 16:21:20 +0300 +Subject: [PATCH] Set library VERSION and SOVERSION + +With soversion and version specified, `install` target will install the +library with the specified version and also create the proper symlink. + +Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/112] +but unlikely to be merged soon as it is a duplicate of +[https://github.com/docopt/docopt.cpp/pull/112] which has been **Open** +since 2016-12-08. +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23da468..feff32e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,6 +50,10 @@ else() + set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE) + + add_library(docopt SHARED $) ++ set_target_properties(docopt PROPERTIES ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR} ++ ) + add_library(docopt_s STATIC $) + endif() + diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb new file mode 100644 index 000000000..aa55ebf84 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb @@ -0,0 +1,27 @@ +SUMMARY = "C++11 port of docopt command-line interface description language and parser" + +DESCRIPTION = "docopt is library that lets you define a command line interface with the \ +utility argument syntax that has been used by command line utilities for \ +decades (formalized in POSIX.1-2017). From the description, docopt \ +automatically generates a parser for the command line arguments." + +HOMEPAGE = "https://github.com/docopt/docopt.cpp" + +LICENSE = "MIT | BSL-1.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE-Boost-1.0;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://LICENSE-MIT;md5=4b242fd9ef20207e18286d73da8a6677 \ +" + +DEPENDS = "boost" +SRCREV = "3dd23e3280f213bacefdf5fcb04857bf52e90917" +PV = "0.6.2+git${SRCPV}" + +SRC_URI = "\ + git://github.com/docopt/docopt.cpp.git;protocol=https \ + file://0001-Set-library-VERSION-and-SOVERSION.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb index c5fc928a7..985bd03e4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb @@ -8,7 +8,7 @@ SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" -inherit autotools python3native gobject-introspection +inherit autotools gobject-introspection SRCREV = "f6e4538485d0442b3674e182c01ffe5a0f258ad4" SRC_URI = " \ @@ -17,11 +17,11 @@ SRC_URI = " \ S = "${WORKDIR}/git" -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.7/site-packages" PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" +PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python" PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch new file mode 100644 index 000000000..5372a23b6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-float-endianness-issue-on-big-endian-arch.patch @@ -0,0 +1,314 @@ +From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= +Date: Wed, 19 Dec 2018 10:24:47 +0800 +Subject: Fix float endianness issue on big endian arch + +It converts float values depending on what order they come in. + +This patch was modified from rm5248 [1] + +[1] https://github.com/synexxus/libmodbus/commit/a511768e7fe7ec52d7bae1d9ae04e33f87a59627 + +--- + src/modbus-data.c | 110 ++++++++++++++++++++++++++++++++++++++--------- + tests/unit-test-client.c | 22 ++++++---- + tests/unit-test.h.in | 41 ++++++++++++++++-- + 3 files changed, 141 insertions(+), 32 deletions(-) + +diff --git a/src/modbus-data.c b/src/modbus-data.c +index 902b8c6..7a744fa 100644 +--- a/src/modbus-data.c ++++ b/src/modbus-data.c +@@ -119,9 +119,18 @@ float modbus_get_float_abcd(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl(((uint32_t)src[0] << 16) + src[1]); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (a << 24) | ++ (b << 16) | ++ (c << 8) | ++ (d << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -131,9 +140,18 @@ float modbus_get_float_dcba(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl(bswap_32((((uint32_t)src[0]) << 16) + src[1])); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (d << 24) | ++ (c << 16) | ++ (b << 8) | ++ (a << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -143,9 +161,18 @@ float modbus_get_float_badc(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl((uint32_t)(bswap_16(src[0]) << 16) + bswap_16(src[1])); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (b << 24) | ++ (a << 16) | ++ (d << 8) | ++ (c << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -155,9 +182,18 @@ float modbus_get_float_cdab(const uint16_t *src) + { + float f; + uint32_t i; ++ uint8_t a, b, c, d; + +- i = ntohl((((uint32_t)src[1]) << 16) + src[0]); +- memcpy(&f, &i, sizeof(float)); ++ a = (src[0] >> 8) & 0xFF; ++ b = (src[0] >> 0) & 0xFF; ++ c = (src[1] >> 8) & 0xFF; ++ d = (src[1] >> 0) & 0xFF; ++ ++ i = (c << 24) | ++ (d << 16) | ++ (a << 8) | ++ (b << 0); ++ memcpy(&f, &i, 4); + + return f; + } +@@ -172,50 +208,84 @@ float modbus_get_float(const uint16_t *src) + memcpy(&f, &i, sizeof(float)); + + return f; ++ + } + + /* Set a float to 4 bytes for Modbus w/o any conversion (ABCD) */ + void modbus_set_float_abcd(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = htonl(i); +- dest[0] = (uint16_t)(i >> 16); +- dest[1] = (uint16_t)i; ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = a; ++ out[1] = b; ++ out[2] = c; ++ out[3] = d; + } + + /* Set a float to 4 bytes for Modbus with byte and word swap conversion (DCBA) */ + void modbus_set_float_dcba(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = bswap_32(htonl(i)); +- dest[0] = (uint16_t)(i >> 16); +- dest[1] = (uint16_t)i; ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = d; ++ out[1] = c; ++ out[2] = b; ++ out[3] = a; ++ + } + + /* Set a float to 4 bytes for Modbus with byte swap conversion (BADC) */ + void modbus_set_float_badc(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = htonl(i); +- dest[0] = (uint16_t)bswap_16(i >> 16); +- dest[1] = (uint16_t)bswap_16(i & 0xFFFF); ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = b; ++ out[1] = a; ++ out[2] = d; ++ out[3] = c; + } + + /* Set a float to 4 bytes for Modbus with word swap conversion (CDAB) */ + void modbus_set_float_cdab(float f, uint16_t *dest) + { + uint32_t i; ++ uint8_t *out = (uint8_t*) dest; ++ uint8_t a, b, c, d; + + memcpy(&i, &f, sizeof(uint32_t)); +- i = htonl(i); +- dest[0] = (uint16_t)i; +- dest[1] = (uint16_t)(i >> 16); ++ a = (i >> 24) & 0xFF; ++ b = (i >> 16) & 0xFF; ++ c = (i >> 8) & 0xFF; ++ d = (i >> 0) & 0xFF; ++ ++ out[0] = c; ++ out[1] = d; ++ out[2] = a; ++ out[3] = b; + } + + /* DEPRECATED - Set a float to 4 bytes in a sort of Modbus format! */ +diff --git a/tests/unit-test-client.c b/tests/unit-test-client.c +index 3e315f4..3fccf3e 100644 +--- a/tests/unit-test-client.c ++++ b/tests/unit-test-client.c +@@ -27,6 +27,7 @@ int send_crafted_request(modbus_t *ctx, int function, + uint16_t max_value, uint16_t bytes, + int backend_length, int backend_offset); + int equal_dword(uint16_t *tab_reg, const uint32_t value); ++int is_memory_equal(const void *s1, const void *s2, size_t size); + + #define BUG_REPORT(_cond, _format, _args ...) \ + printf("\nLine %d: assertion error for '%s': " _format "\n", __LINE__, # _cond, ## _args) +@@ -40,6 +41,11 @@ int equal_dword(uint16_t *tab_reg, const uint32_t value); + } \ + }; + ++int is_memory_equal(const void *s1, const void *s2, size_t size) ++{ ++ return (memcmp(s1, s2, size) == 0); ++} ++ + int equal_dword(uint16_t *tab_reg, const uint32_t value) { + return ((tab_reg[0] == (value >> 16)) && (tab_reg[1] == (value & 0xFFFF))); + } +@@ -286,26 +292,26 @@ int main(int argc, char *argv[]) + /** FLOAT **/ + printf("1/4 Set/get float ABCD: "); + modbus_set_float_abcd(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_ABCD), "FAILED Set float ABCD"); +- real = modbus_get_float_abcd(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_ABCD_SET, 4), "FAILED Set float ABCD"); ++ real = modbus_get_float_abcd(UT_IREAL_ABCD_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("2/4 Set/get float DCBA: "); + modbus_set_float_dcba(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_DCBA), "FAILED Set float DCBA"); +- real = modbus_get_float_dcba(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_DCBA_SET, 4), "FAILED Set float DCBA"); ++ real = modbus_get_float_dcba(UT_IREAL_DCBA_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("3/4 Set/get float BADC: "); + modbus_set_float_badc(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_BADC), "FAILED Set float BADC"); +- real = modbus_get_float_badc(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_BADC_SET, 4), "FAILED Set float BADC"); ++ real = modbus_get_float_badc(UT_IREAL_BADC_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("4/4 Set/get float CDAB: "); + modbus_set_float_cdab(UT_REAL, tab_rp_registers); +- ASSERT_TRUE(equal_dword(tab_rp_registers, UT_IREAL_CDAB), "FAILED Set float CDAB"); +- real = modbus_get_float_cdab(tab_rp_registers); ++ ASSERT_TRUE(is_memory_equal(tab_rp_registers, UT_IREAL_CDAB_SET, 4), "FAILED Set float CDAB"); ++ real = modbus_get_float_cdab(UT_IREAL_CDAB_GET); + ASSERT_TRUE(real == UT_REAL, "FAILED (%f != %f)\n", real, UT_REAL); + + printf("\nAt this point, error messages doesn't mean the test has failed\n"); +diff --git a/tests/unit-test.h.in b/tests/unit-test.h.in +index dca826f..4ffa254 100644 +--- a/tests/unit-test.h.in ++++ b/tests/unit-test.h.in +@@ -56,12 +56,45 @@ const uint16_t UT_INPUT_REGISTERS_ADDRESS = 0x108; + const uint16_t UT_INPUT_REGISTERS_NB = 0x1; + const uint16_t UT_INPUT_REGISTERS_TAB[] = { 0x000A }; + ++/* ++ * This float value is 0x47F12000 (in big-endian format). ++ * In Little-endian(intel) format, it will be stored in memory as follows: ++ * 0x00 0x20 0xF1 0x47 ++ * ++ * You can check this with the following code: ++ ++ float fl = UT_REAL; ++ uint8_t *inmem = (uint8_t*)&fl; ++ int x; ++ for(x = 0; x < 4; x++){ ++ printf("0x%02X ", inmem[ x ]); ++ } ++ printf("\n"); ++ */ + const float UT_REAL = 123456.00; + +-const uint32_t UT_IREAL_ABCD = 0x0020F147; +-const uint32_t UT_IREAL_DCBA = 0x47F12000; +-const uint32_t UT_IREAL_BADC = 0x200047F1; +-const uint32_t UT_IREAL_CDAB = 0xF1470020; ++/* ++ * The following arrays assume that 'A' is the MSB, ++ * and 'D' is the LSB. ++ * Thus, the following is the case: ++ * A = 0x47 ++ * B = 0xF1 ++ * C = 0x20 ++ * D = 0x00 ++ * ++ * There are two sets of arrays: one to test that the setting is correct, ++ * the other to test that the getting is correct. ++ * Note that the 'get' values must be constants in processor-endianness, ++ * as libmodbus will convert all words to processor-endianness as they come in. ++ */ ++const uint8_t UT_IREAL_ABCD_SET[] = {0x47, 0xF1, 0x20, 0x00}; ++const uint16_t UT_IREAL_ABCD_GET[] = {0x47F1, 0x2000}; ++const uint8_t UT_IREAL_DCBA_SET[] = {0x00, 0x20, 0xF1, 0x47}; ++const uint16_t UT_IREAL_DCBA_GET[] = {0x0020, 0xF147}; ++const uint8_t UT_IREAL_BADC_SET[] = {0xF1, 0x47, 0x00, 0x20}; ++const uint16_t UT_IREAL_BADC_GET[] = {0xF147, 0x0020}; ++const uint8_t UT_IREAL_CDAB_SET[] = {0x20, 0x00, 0x47, 0xF1}; ++const uint16_t UT_IREAL_CDAB_GET[] = {0x2000, 0x47F1}; + + /* const uint32_t UT_IREAL_ABCD = 0x47F12000); + const uint32_t UT_IREAL_DCBA = 0x0020F147; diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch new file mode 100644 index 000000000..384a4a40b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/Fix-typo.patch @@ -0,0 +1,52 @@ +From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= +Date: Thu, 27 Sep 2018 14:51:32 +0800 +Subject: Fix typo + +--- + doc/modbus_mapping_new_start_address.txt | 4 ++-- + doc/modbus_reply.txt | 2 +- + doc/modbus_reply_exception.txt | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/modbus_mapping_new_start_address.txt b/doc/modbus_mapping_new_start_address.txt +index 4fa196a..94a81fb 100644 +--- a/doc/modbus_mapping_new_start_address.txt ++++ b/doc/modbus_mapping_new_start_address.txt +@@ -21,9 +21,9 @@ The _modbus_mapping_new_start_address()_ function shall allocate four arrays to + store bits, input bits, registers and inputs registers. The pointers are stored + in modbus_mapping_t structure. All values of the arrays are initialized to zero. + +-The different starting adresses make it possible to place the mapping at any ++The different starting addresses make it possible to place the mapping at any + address in each address space. This way, you can give access to values stored +-at high adresses without allocating memory from the address zero, for eg. to ++at high addresses without allocating memory from the address zero, for eg. to + make available registers from 10000 to 10009, you can use: + + [source,c] +diff --git a/doc/modbus_reply.txt b/doc/modbus_reply.txt +index 0b29d6f..6b71d11 100644 +--- a/doc/modbus_reply.txt ++++ b/doc/modbus_reply.txt +@@ -3,7 +3,7 @@ modbus_reply(3) + + NAME + ---- +-modbus_reply - send a reponse to the received request ++modbus_reply - send a response to the received request + + + SYNOPSIS +diff --git a/doc/modbus_reply_exception.txt b/doc/modbus_reply_exception.txt +index 7e6324f..b2170be 100644 +--- a/doc/modbus_reply_exception.txt ++++ b/doc/modbus_reply_exception.txt +@@ -3,7 +3,7 @@ modbus_reply_exception(3) + + NAME + ---- +-modbus_reply_exception - send an exception reponse ++modbus_reply_exception - send an exception response + + + SYNOPSIS diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch new file mode 100644 index 000000000..7fae34e7d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus/f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch @@ -0,0 +1,32 @@ +From f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d Mon Sep 17 00:00:00 2001 +From: i-ky +Date: Tue, 10 Jul 2018 15:58:45 +0300 +Subject: [PATCH] Fixed MODBUS_GET_* macros in case of negative values + +In case resulting value should be negative it is incorrect to use '+' operator to construct it from pieces, because highest bytes will result in negative number after bitwise shift while others will stay positive. Replacing addition with '|' should solve the issue. +--- + src/modbus.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/modbus.h b/src/modbus.h +index f6e9a5f5..c63f5ceb 100644 +--- a/src/modbus.h ++++ b/src/modbus.h +@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, + #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF) + #define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF) + #define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \ +- (((int64_t)tab_int16[(index) ] << 48) + \ +- ((int64_t)tab_int16[(index) + 1] << 32) + \ +- ((int64_t)tab_int16[(index) + 2] << 16) + \ ++ (((int64_t)tab_int16[(index) ] << 48) | \ ++ ((int64_t)tab_int16[(index) + 1] << 32) | \ ++ ((int64_t)tab_int16[(index) + 2] << 16) | \ + (int64_t)tab_int16[(index) + 3]) +-#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) + tab_int16[(index) + 1]) +-#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) + tab_int8[(index) + 1]) ++#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) | tab_int16[(index) + 1]) ++#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) | tab_int8[(index) + 1]) + #define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \ + do { \ + tab_int8[(index)] = (value) >> 8; \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb deleted file mode 100644 index cc45fa7e2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libmodbus.inc - -SRC_URI[md5sum] = "b1a8fd3a40d2db4de51fb0cbcb201806" -SRC_URI[sha256sum] = "c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637" diff --git a/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb new file mode 100644 index 000000000..075487ae9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb @@ -0,0 +1,12 @@ +require libmodbus.inc + +SRC_URI += "file://f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d.patch \ + file://Fix-float-endianness-issue-on-big-endian-arch.patch \ + file://Fix-typo.patch" +SRC_URI[md5sum] = "15c84c1f7fb49502b3efaaa668cfd25e" +SRC_URI[sha256sum] = "d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16" + +# this file has been created one minute after the configure file, so it doesn't get recreated during configure step +do_configure_prepend() { + rm -rf ${S}/tests/unit-test.h +} 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 2dbeee7c3..3a0a87eea 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 @@ -18,6 +18,7 @@ PV = "1.3+git${SRCPV}" SRCREV = "c6934373c7bac91499ff7bbe7d2439599325ca63" 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 new file mode 100644 index 000000000..cf380ddf4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch @@ -0,0 +1,245 @@ +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/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 6ce3cab11..5df44f21f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" -SRCREV = "6003f9997587e6a563cebf1f246bcd0eb6deff3d" +SRCREV = "b31bce98d65f894aad6427bcf6f3f7822e261a59" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch new file mode 100644 index 000000000..cbf3aee10 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch @@ -0,0 +1,106 @@ +From 20981c8a328747f823b7eef68d0c2812b3eaed30 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jul 2019 21:50:43 +0200 +Subject: [PATCH] fix include to find SIOCGSTAMP with latest kernel + +In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 +the asm-generic/sockios.h header no longer defines SIOCGSTAMP. +Instead it provides only SIOCGSTAMP_OLD. + +The linux/sockios.h header now defines SIOCGSTAMP using either +SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only +header file is not pulled so we get a build failure. + +canlogserver.c: In function 'main': +canlogserver.c:404:21: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGRARP'? + if (ioctl(s[i], SIOCGSTAMP, &tv) < 0) + ^~~~~~~~~~ + SIOCGRARP +canlogserver.c:404:21: note: each undeclared identifier is reported only once for each function it appears in + +Fixes: + - http://autobuild.buildroot.org/results/363de7d9bf433be8bc47ba4ee52ae0bb80fa9021 + +Upstream-Status: Backport [https://github.com/linux-can/can-utils/commit/e9590b1ca75d360eaf3211bebd86058214d48064] +Signed-off-by: Fabrice Fontaine +--- + canlogserver.c | 1 + + cansniffer.c | 1 + + isotpdump.c | 1 + + isotpperf.c | 1 + + isotpsniffer.c | 1 + + slcanpty.c | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/canlogserver.c b/canlogserver.c +index e3350b7..f53165c 100644 +--- a/canlogserver.c ++++ b/canlogserver.c +@@ -61,6 +61,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/cansniffer.c b/cansniffer.c +index 7b0a3fa..bf7d72e 100644 +--- a/cansniffer.c ++++ b/cansniffer.c +@@ -61,6 +61,7 @@ + + #include + #include ++#include + + #include "terminal.h" + +diff --git a/isotpdump.c b/isotpdump.c +index b2b650a..36d8af3 100644 +--- a/isotpdump.c ++++ b/isotpdump.c +@@ -55,6 +55,7 @@ + + #include + #include ++#include + #include "terminal.h" + + #define NO_CAN_ID 0xFFFFFFFFU +diff --git a/isotpperf.c b/isotpperf.c +index db3a2b7..5852a57 100644 +--- a/isotpperf.c ++++ b/isotpperf.c +@@ -56,6 +56,7 @@ + + #include + #include ++#include + + #define NO_CAN_ID 0xFFFFFFFFU + #define PERCENTRES 2 /* resolution in percent for bargraph */ +diff --git a/isotpsniffer.c b/isotpsniffer.c +index f42e18b..d7a4c66 100644 +--- a/isotpsniffer.c ++++ b/isotpsniffer.c +@@ -55,6 +55,7 @@ + + #include + #include ++#include + #include "terminal.h" + + #define NO_CAN_ID 0xFFFFFFFFU +diff --git a/slcanpty.c b/slcanpty.c +index 431ca68..7dfaf5c 100644 +--- a/slcanpty.c ++++ b/slcanpty.c +@@ -40,6 +40,7 @@ + + #include + #include ++#include + + /* maximum rx buffer len: extended CAN frame with timestamp */ + #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index a2d62c366..db5055fed 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=43;md5=390a2c9a3c5e3595a0 DEPENDS = "libsocketcan" -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master \ + file://0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch \ + " SRCREV = "4c8fb05cb4d6ddcd67299008db54af423f86fd05" PV = "0.0+gitr${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb index 39c478a95..e58bdd493 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -9,7 +9,9 @@ inherit bash-completion kernelsrc kernel-arch do_populate_lic[depends] += "virtual/kernel:do_patch" -EXTRA_OEMAKE = "-C ${S}/tools/bpf/bpftool O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}" +EXTRA_OEMAKE = "V=1 -C ${S}/tools/bpf/bpftool O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}" + +SECURITY_CFLAGS = "" do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb index 0a7c384a7..770b99ff0 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb @@ -117,4 +117,4 @@ RDEPENDS_${PN}_class-cross = "" ARM_INSTRUCTION_SET = "arm" # http://errors.yoctoproject.org/Errors/Details/186964/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 7370f9fb4..ff9720f8d 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -39,6 +39,7 @@ EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ ARCH=${ARCH} \ CC="${CC}" \ + CLANG="clang -fno-stack-protector" \ AR="${AR}" \ LD="${LD}" \ DESTDIR="${D}" \ @@ -52,20 +53,11 @@ KERNEL_SELFTEST_SRC ?= "Makefile \ LICENSES \ " -python __anonymous () { - import re - - var = d.getVar('TARGET_CC_ARCH') - pattern = '_FORTIFY_SOURCE=[^0]' - - if re.search(pattern, var): - d.appendVar('TARGET_CC_ARCH', " -O") -} - do_compile() { - bbwarn "clang >= 6.0 with bpf support is needed with kernel 4.18+ so \ -either install it and add it to HOSTTOOLS, or add \ -clang-native from meta-clang to dependency" + if [ ${@bb.utils.contains('DEPENDS', 'clang-native', 'True', 'False', d)} = 'False' ]; then + bbwarn "clang >= 6.0 with bpf support is needed with kernel 4.18+ so +either install it and add it to HOSTTOOLS, or add clang-native from meta-clang to dependency" + fi for i in ${TEST_LIST} do oe_runmake -C ${S}/tools/testing/selftests/${i} @@ -122,13 +114,4 @@ RDEPENDS_${PN} += "python3" # tools/testing/selftests/vm/Makefile doesn't respect LDFLAGS and tools/testing/selftests/Makefile explicitly overrides to empty INSANE_SKIP_${PN} += "ldflags" -# userfaultfd.c:126:2: error: format not a string literal and no format arguments [-Werror=format-security] -# fprintf(stderr, examples); -# ^~~~~~~ -SECURITY_STRINGFORMAT = "" - -# https://errors.yoctoproject.org/Errors/Details/261657/ -# kernel-selftest/1.0-r0/recipe-sysroot/usr/include/bits/fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments -# __open_missing_mode (); -# ^~~~~~~~~~~~~~~~~~~~~~ -lcl_maybe_fortify = "" +SECURITY_CFLAGS = "" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb index dc247942f..6326a2538 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb @@ -2,9 +2,9 @@ require kpatch.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "d7c5810e2a6acacfa5fec1e38d2f75af8e8c818c" +SRCREV = "2a29bc7dea9a7da12705c7b50315eee1acdd9156" -PV = "0.7.1+git${SRCPV}" +PV = "0.8.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index 50dab8d16..051656b5a 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb @@ -43,4 +43,4 @@ do_install_append() { } # http://errors.yoctoproject.org/Errors/Details/186966/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb index e6b9d6b5b..6b955dcfd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb @@ -19,4 +19,4 @@ do_configure_prepend () { } # http://errors.yoctoproject.org/Errors/Details/186961/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.bb b/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.bb index 4d3a96f29..dca86f3c6 100644 --- a/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.bb +++ b/meta-openembedded/meta-oe/recipes-security/keyutils/keyutils_1.6.bb @@ -46,7 +46,7 @@ do_install_ptest () { } -RDEPENDS_${PN}-ptest += "lsb" +RDEPENDS_${PN}-ptest += "lsb-release" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb new file mode 100644 index 000000000..f74a39b50 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "CommonMark parsing and rendering library and program in C" +HOMEPAGE = "https://github.com/commonmark/cmark" +LICENSE = "BSD-2-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" + +SRC_URI = "git://github.com/commonmark/cmark.git" +SRCREV = "8daa6b1495124f0b67e6034130e12d7be83e38bd" +S = "${WORKDIR}/git" + +PV = "0.29.0" + +inherit cmake lib_package + +EXTRA_OECMAKE += " \ + -DCMARK_TESTS=OFF \ + -DCMARK_STATIC=OFF \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index 84e9bca0e..35251cb8d 100644 --- a/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -12,7 +12,7 @@ data." SECTION = "System/Servers" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/PD;md5=b3597d12946881e13cb3b548d1173851" +LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c1e2ffb3b507dd647" LICENSE = "PD" SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb deleted file mode 100644 index 3ef7bee43..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.9.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" - -DEPENDS = "curl openssl zlib libssh2 libgcrypt" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.27" -SRCREV = "3828d7afdd08b595584048e8e4dab6ddd4506ed1" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DTHREADSAFE=ON \ - -DBUILD_CLAR=OFF \ - -DSHA1_TYPE="builtin" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_EXAMPLES=OFF \ - -DLIB_INSTALL_DIR=${libdir} \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb new file mode 100644 index 000000000..82acc4926 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "the Git linkable library" +HOMEPAGE = "http://libgit2.github.com/" +LICENSE = "GPL-2.0-with-GCC-exception & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" + +DEPENDS = "curl openssl zlib libssh2 libgcrypt" + +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.28" +SRCREV = "7ce88e66a19e3b48340abcdd86aeaae1882e63cc" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "\ + -DBUILD_CLAR=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb index 756b143ef..d55902898 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb @@ -12,7 +12,8 @@ PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} + +inherit python3native PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.0.bb b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.0.bb new file mode 100644 index 000000000..5ca2dda32 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.0.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Tiny XML Library" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +HOMEPAGE = "https://www.msweet.org/mxml/" +BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" + +SRC_URI = "git://github.com/michaelrsweet/mxml.git" +SRCREV = "c7755b6992a2afdd34dde47fc9be97f1237cfded" +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "threads" +PACKAGECONFIG[threads] = "--enable-threads,--disable-threads" + +# Package does not support out of tree builds. +B = "${S}" + +# MXML uses autotools but it explicitly states it does not support autoheader. +EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" + +do_configure_prepend() { + # Respect optimization CFLAGS specified by OE. + sed -e 's/-Os -g//' -i ${S}/configure.ac + + # Enable verbose compilation output. This is required for extra QA checks to work. + sed -e '/.SILENT:/d' -i ${S}/Makefile.in +} + +do_install() { + # Package uses DSTROOT instread of standard DESTDIR to specify install location. + oe_runmake install DSTROOT=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_git.bb b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_git.bb deleted file mode 100644 index b17fc67e0..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_git.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Tiny XML Library" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -HOMEPAGE = "https://www.msweet.org/mxml/" -BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" - -SRC_URI = "git://github.com/michaelrsweet/mxml.git" -SRCREV = "c7755b6992a2afdd34dde47fc9be97f1237cfded" -S = "${WORKDIR}/git" -# v3.0 -PV = "3.0" - -CONFIGUREOPTS = " --prefix=${prefix} \ - --bindir=${bindir} \ - --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sharedstatedir=${sharedstatedir} \ - --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --oldincludedir=${oldincludedir} \ - --infodir=${infodir} \ - --mandir=${mandir} \ - --host=${TARGET_SYS} \ - --build=${BUILD_SYS} \ - ${PACKAGECONFIG_CONFARGS} \ - " - -do_configure() { - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - ./configure ${CONFIGUREOPTS} --enable-shared -} - -do_install () { - export DSTROOT=${D} - oe_runmake install -} - -PACKAGES += " ${PN}-bin " -FILES_${PN} = "${libdir}/*" -FILES_${PN}-bin = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb index 2c4febbe0..32bc13d1b 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb @@ -1,3 +1,6 @@ +# Break circular dependencies, only populate sysroot (header, +# libraries) to other recipe for compiling, recipe lvm2 +# generates package libdevmapper require lvm2.inc SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" @@ -10,6 +13,7 @@ do_install() { oe_runmake 'DESTDIR=${D}' -C libdm install } -RRECOMMENDS_${PN}_append_class-target = " lvm2-udevrules" +# Do not generate package libdevmapper +PACKAGES = "" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch deleted file mode 100644 index 24160b405..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3c16d9aaa46602e7594d717d86e7f02066d21134 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 26 Nov 2018 17:20:20 +0800 -Subject: [PATCH] explicitly do not install libdm - -Already have package libdevmapper which split from lvm2, -explicitly do not do the installation here. - -Upstream-Status: Inappropriate [meta-oe specific] - -Signed-off-by: Hongxu Jia - - -Update context for lvm2 2.03.02. - -Signed-off-by: Kai Kang ---- - libdm/Makefile.in | 6 ++++-- - libdm/dm-tools/Makefile.in | 6 ++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libdm/Makefile.in b/libdm/Makefile.in -index e9bb5ae..4e9ae3f 100644 ---- a/libdm/Makefile.in -+++ b/libdm/Makefile.in -@@ -82,9 +82,11 @@ ifeq ("@PKGCONFIG@", "yes") - INSTALL_TYPE += install_pkgconfig - endif - --install: $(INSTALL_TYPE) install_include -+install: -+ echo "Do not install device mapper in lvm2" - --install_device-mapper: install -+install_device-mapper: -+ echo "Do not install device mapper in lvm2" - - install_include: $(srcdir)/libdevmapper.h - @echo " [INSTALL] $<" -diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in -index 15a9d8e..65e1306 100644 ---- a/libdm/dm-tools/Makefile.in -+++ b/libdm/dm-tools/Makefile.in -@@ -20,7 +20,8 @@ all: device-mapper - - SOURCES2 = dmsetup.c - TARGETS_DM = dmsetup --install_device-mapper: install_dmsetup_dynamic -+install_device-mapper: -+ echo "Do not install device mapper in lvm2" - - ifeq ("@STATIC_LINK@", "yes") - TARGETS_DM += dmsetup.static -@@ -93,6 +94,7 @@ install_dmfilemapd_static: dmfilemapd.static - .PHONY: install_dmsetup_dynamic install_dmsetup_static - .PHONY: install_dmfilemapd install_dmfilemapd_static - --install: install_device-mapper install_dmfilemapd -+install: -+ echo "Do not install device mapper in lvm2" - - device-mapper: $(TARGETS_DM) --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb index 9922ef79d..785c6960e 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb @@ -2,7 +2,7 @@ require lvm2.inc SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" -SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch \ +SRC_URI += " \ file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ " @@ -46,6 +46,13 @@ LVM2_PACKAGECONFIG_append_class-target = " \ " PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev" +PACKAGES =+ "libdevmapper" +FILES_libdevmapper = " \ + ${libdir}/libdevmapper.so.* \ + ${sbindir}/dmsetup \ + ${sbindir}/dmstats \ +" + FILES_${PN} += "${libdir}/device-mapper/*.so" FILES_${PN}-scripts = " \ ${sbindir}/blkdeactivate \ @@ -65,4 +72,13 @@ RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" +SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" +remove_libdevmapper_sysroot_preprocess() { + rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ + ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ + ${SYSROOT_DESTDIR}${sbindir}/dmstats \ + ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ + ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc +} + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb index 55866e984..8d86e606c 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb @@ -19,6 +19,7 @@ and deletion" HOMEPAGE = "http://christophe.varoqui.free.fr/" DEPENDS = "libdevmapper \ + lvm2 \ libaio \ liburcu \ readline \ @@ -108,4 +109,4 @@ FILES_kpartx = "${base_sbindir}/kpartx \ ${nonarch_libdir}/udev/kpartx_id \ " -RDEPENDS_${PN} += "bash kpartx" +RDEPENDS_${PN} += "kpartx" diff --git a/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb index c56c8b9dd..9e609c4dd 100644 --- a/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb @@ -27,8 +27,7 @@ do_install() { } do_deploy() { - install -d ${DEPLOY_DIR_TOOLS} - install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV} + install -m 0755 sjf2410 ${DEPLOYDIR}/sjf2410-${PV} } addtask deploy before do_build after do_install diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch new file mode 100644 index 000000000..d9190e5bd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch @@ -0,0 +1,116 @@ +From dd6ad8ca447457c812809791ab8622da8646104c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 30 Aug 2019 13:07:33 -0700 +Subject: [PATCH] Don't use __GNUC_PREREQ + +These are not official GCC predefined macros; they are macros defined +by GNU libc and some versions of BSD libc for internal use by their +own headers, and we shouldn't be using them without checking for their +availability first + +Signed-off-by: Khem Raj +--- + lib/efi/efi.h | 4 ++-- + lib/engine/pragma.h | 4 ++-- + lib/log/log.h | 4 ++-- + lib/mpb/machine_bytes.h | 4 ++-- + lib/mpb/mpb.h | 4 ++-- + lib/orom/orom.h | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/lib/efi/efi.h b/lib/efi/efi.h +index 0620d9c..c8358db 100644 +--- a/lib/efi/efi.h ++++ b/lib/efi/efi.h +@@ -33,9 +33,9 @@ + #include + #include + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #if defined(__cplusplus) + extern "C" { +diff --git a/lib/engine/pragma.h b/lib/engine/pragma.h +index 8205ed3..fa0b268 100644 +--- a/lib/engine/pragma.h ++++ b/lib/engine/pragma.h +@@ -32,9 +32,9 @@ + + #include + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #define SSI_HAS_PRAGMA_ONCE +-#endif /* __GNUC_PREREQ */ ++#endif + + #ifdef SSI_HAS_PRAGMA_ONCE + #pragma once +diff --git a/lib/log/log.h b/lib/log/log.h +index 66a707b..ca5000a 100644 +--- a/lib/log/log.h ++++ b/lib/log/log.h +@@ -32,9 +32,9 @@ + + #include + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #if defined(__cplusplus) + extern "C" { +diff --git a/lib/mpb/machine_bytes.h b/lib/mpb/machine_bytes.h +index 6cb81c9..807461f 100644 +--- a/lib/mpb/machine_bytes.h ++++ b/lib/mpb/machine_bytes.h +@@ -27,9 +27,9 @@ + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #ifndef __ENDIAN_H__INCLUDED__ + #define __ENDIAN_H__INCLUDED__ +diff --git a/lib/mpb/mpb.h b/lib/mpb/mpb.h +index 32beb21..98f82fe 100644 +--- a/lib/mpb/mpb.h ++++ b/lib/mpb/mpb.h +@@ -27,9 +27,9 @@ + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #ifndef __MPB_H__INCLUDED__ + #define __MPB_H__INCLUDED__ +diff --git a/lib/orom/orom.h b/lib/orom/orom.h +index 4492066..16b03a6 100644 +--- a/lib/orom/orom.h ++++ b/lib/orom/orom.h +@@ -32,9 +32,9 @@ + + #include + +-#if __GNUC_PREREQ(3, 4) ++#if ((defined __GNUC__ && __GNUC__ >= 3 && __GNUC_MINOR__ >= 4) || defined __clang__) + #pragma once +-#endif /* __GNUC_PREREQ */ ++#endif + + #if defined(__cplusplus) + extern "C" { diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch new file mode 100644 index 000000000..fd44571b6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch @@ -0,0 +1,32 @@ +From 258a1d128581f185a7a5070f47df06e5c29c9db8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 30 Aug 2019 13:43:32 -0700 +Subject: [PATCH] Include libgen.h + +Use XPG version of basename on non gnu libc systems +ideally posix version should be used everywhere but that +would be upstreams choice to make + +Signed-off-by: Khem Raj +--- + tools/ssieventmonitor.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp +index 0d11975..af7e09c 100644 +--- a/tools/ssieventmonitor.cpp ++++ b/tools/ssieventmonitor.cpp +@@ -39,7 +39,9 @@ + #include + #include + #include +- ++#ifndef __GLIBC__ ++#include ++#endif + extern "C" { + #include "lib/safeclib/safe_str_lib.h" + } +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch deleted file mode 100644 index ef6ae00e3..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch +++ /dev/null @@ -1,872 +0,0 @@ -From 3100e23c50e38bff0c2ec77bc30049c113c29414 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Jun 2017 20:44:31 -0700 -Subject: [PATCH 1/6] Use pragma once unconditionally - -in OE we do not worry about supporting -gcc 3.4 anyway - -Upstream-Status: Inappropriate[Bumps required gcc to be > 3.4] - -Signed-off-by: Khem Raj ---- - lib/efi/efi.h | 2 -- - lib/engine/ahci.h | 2 -- - lib/engine/ahci_cdrom.h | 2 -- - lib/engine/ahci_disk.h | 2 -- - lib/engine/ahci_multiplier.h | 2 -- - lib/engine/ahci_multiplier_phy.h | 2 -- - lib/engine/ahci_multiplier_port.h | 2 -- - lib/engine/ahci_phy.h | 2 -- - lib/engine/ahci_port.h | 2 -- - lib/engine/ahci_raid_info.h | 2 -- - lib/engine/ahci_tape.h | 2 -- - lib/engine/array.h | 2 -- - lib/engine/block_device.h | 2 -- - lib/engine/cache.h | 2 -- - lib/engine/container.h | 2 -- - lib/engine/context_manager.h | 2 -- - lib/engine/controller.h | 2 -- - lib/engine/enclosure.h | 2 -- - lib/engine/end_device.h | 2 -- - lib/engine/event.h | 2 -- - lib/engine/event_manager.h | 2 -- - lib/engine/exception.h | 2 -- - lib/engine/filesystem.h | 2 -- - lib/engine/isci.h | 2 -- - lib/engine/isci_cdrom.h | 2 -- - lib/engine/isci_disk.h | 2 -- - lib/engine/isci_expander.h | 2 -- - lib/engine/isci_expander_phy.h | 2 -- - lib/engine/isci_expander_port.h | 2 -- - lib/engine/isci_phy.h | 2 -- - lib/engine/isci_port.h | 2 -- - lib/engine/isci_raid_info.h | 2 -- - lib/engine/isci_tape.h | 2 -- - lib/engine/list.h | 2 -- - lib/engine/mdadm_config.h | 2 -- - lib/engine/multimedia_device.h | 2 -- - lib/engine/nondisk_device.h | 2 -- - lib/engine/object.h | 2 -- - lib/engine/pci_header.h | 2 -- - lib/engine/phy.h | 2 -- - lib/engine/port.h | 2 -- - lib/engine/raid_device.h | 2 -- - lib/engine/raid_info.h | 2 -- - lib/engine/remote_port.h | 2 -- - lib/engine/routing_device.h | 2 -- - lib/engine/session.h | 2 -- - lib/engine/session_manager.h | 2 -- - lib/engine/storage_device.h | 2 -- - lib/engine/stream_device.h | 2 -- - lib/engine/string.h | 2 -- - lib/engine/unique_id_manager.h | 2 -- - lib/engine/utils.h | 2 -- - lib/engine/volume.h | 2 -- - lib/log/log.h | 2 -- - lib/mpb/machine_bytes.h | 2 -- - lib/mpb/mpb.h | 2 -- - lib/orom/orom.h | 2 -- - 57 files changed, 114 deletions(-) - -diff --git a/lib/efi/efi.h b/lib/efi/efi.h -index 9e7e41b..804e567 100644 ---- a/lib/efi/efi.h -+++ b/lib/efi/efi.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EFI_H__INCLUDED__ - #define __EFI_H__INCLUDED__ -diff --git a/lib/engine/ahci.h b/lib/engine/ahci.h -index e883d1a..80a9699 100644 ---- a/lib/engine/ahci.h -+++ b/lib/engine/ahci.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_H__INCLUDED__ - #define __AHCI_H__INCLUDED__ -diff --git a/lib/engine/ahci_cdrom.h b/lib/engine/ahci_cdrom.h -index 442f301..d8ca042 100644 ---- a/lib/engine/ahci_cdrom.h -+++ b/lib/engine/ahci_cdrom.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_CDROM_H__INCLUDED__ - #define __AHCI_CDROM_H__INCLUDED__ -diff --git a/lib/engine/ahci_disk.h b/lib/engine/ahci_disk.h -index 7892a53..1bad9ad 100644 ---- a/lib/engine/ahci_disk.h -+++ b/lib/engine/ahci_disk.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_DISK_H__INCLUDED__ - #define __AHCI_DISK_H__INCLUDED__ -diff --git a/lib/engine/ahci_multiplier.h b/lib/engine/ahci_multiplier.h -index d63e9bc..1029af2 100644 ---- a/lib/engine/ahci_multiplier.h -+++ b/lib/engine/ahci_multiplier.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_MULTIPLIER_H__INCLUDED__ - #define __AHCI_MULTIPLIER_H__INCLUDED__ -diff --git a/lib/engine/ahci_multiplier_phy.h b/lib/engine/ahci_multiplier_phy.h -index 58ecebc..2132c23 100644 ---- a/lib/engine/ahci_multiplier_phy.h -+++ b/lib/engine/ahci_multiplier_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_MULTIPLIER_PHY_H__INCLUDED__ - #define __AHCI_MULTIPLIER_PHY_H__INCLUDED__ -diff --git a/lib/engine/ahci_multiplier_port.h b/lib/engine/ahci_multiplier_port.h -index 5ff4cf7..2402473 100644 ---- a/lib/engine/ahci_multiplier_port.h -+++ b/lib/engine/ahci_multiplier_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_MULTIPLIER_PORT_H__INCLUDED__ - #define __AHCI_MULTIPLIER_PORT_H__INCLUDED__ -diff --git a/lib/engine/ahci_phy.h b/lib/engine/ahci_phy.h -index e2254e7..a44dae0 100644 ---- a/lib/engine/ahci_phy.h -+++ b/lib/engine/ahci_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_PHY_H__INCLUDED__ - #define __AHCI_PHY_H__INCLUDED__ -diff --git a/lib/engine/ahci_port.h b/lib/engine/ahci_port.h -index f9e3308..03c109b 100644 ---- a/lib/engine/ahci_port.h -+++ b/lib/engine/ahci_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_PORT_H__INCLUDED__ - #define __AHCI_PORT_H__INCLUDED__ -diff --git a/lib/engine/ahci_raid_info.h b/lib/engine/ahci_raid_info.h -index e1c81ae..c70e63e 100644 ---- a/lib/engine/ahci_raid_info.h -+++ b/lib/engine/ahci_raid_info.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_RAID_INFO_H__INCLUDED__ - #define __AHCI_RAID_INFO_H__INCLUDED__ -diff --git a/lib/engine/ahci_tape.h b/lib/engine/ahci_tape.h -index cdd9f13..a91fd2c 100644 ---- a/lib/engine/ahci_tape.h -+++ b/lib/engine/ahci_tape.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __AHCI_TAPE_H__INCLUDED__ - #define __AHCI_TAPE_H__INCLUDED__ -diff --git a/lib/engine/array.h b/lib/engine/array.h -index 36fb4a4..0986ce3 100644 ---- a/lib/engine/array.h -+++ b/lib/engine/array.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ARRAY_H__INCLUDED__ - #define __ARRAY_H__INCLUDED__ -diff --git a/lib/engine/block_device.h b/lib/engine/block_device.h -index 4503914..45dd3db 100644 ---- a/lib/engine/block_device.h -+++ b/lib/engine/block_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __BLOCK_DEVICE_H__INCLUDED__ - #define __BLOCK_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/cache.h b/lib/engine/cache.h -index 72cf521..72da20b 100644 ---- a/lib/engine/cache.h -+++ b/lib/engine/cache.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CACHE_H__INCLUDED__ - #define __CACHE_H__INCLUDED__ -diff --git a/lib/engine/container.h b/lib/engine/container.h -index 53867b0..c71180c 100644 ---- a/lib/engine/container.h -+++ b/lib/engine/container.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CONTAINER_H__INCLUDED__ - #define __CONTAINER_H__INCLUDED__ -diff --git a/lib/engine/context_manager.h b/lib/engine/context_manager.h -index fe9c256..6b4a2e7 100644 ---- a/lib/engine/context_manager.h -+++ b/lib/engine/context_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CONTEXT_H__INCLUDED__ - #define __CONTEXT_H__INCLUDED__ -diff --git a/lib/engine/controller.h b/lib/engine/controller.h -index a2f188a..6bd078f 100644 ---- a/lib/engine/controller.h -+++ b/lib/engine/controller.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CONTROLLER_H__INCLUDED__ - #define __CONTROLLER_H__INCLUDED__ -diff --git a/lib/engine/enclosure.h b/lib/engine/enclosure.h -index 3faef0c..f4b13cc 100644 ---- a/lib/engine/enclosure.h -+++ b/lib/engine/enclosure.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ENCLOSURE_H__INCLUDED__ - #define __ENCLOSURE_H__INCLUDED__ -diff --git a/lib/engine/end_device.h b/lib/engine/end_device.h -index f147e41..269b236 100644 ---- a/lib/engine/end_device.h -+++ b/lib/engine/end_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __END_DEVICE_H__INCLUDED__ - #define __END_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/event.h b/lib/engine/event.h -index cf9bb4f..11a4926 100644 ---- a/lib/engine/event.h -+++ b/lib/engine/event.h -@@ -12,9 +12,7 @@ Redistribution and use in source and binary forms, with or without modification, - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. - */ - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EVENT_H__INCLUDED__ - #define __EVENT_H__INCLUDED__ -diff --git a/lib/engine/event_manager.h b/lib/engine/event_manager.h -index 65007b9..a7a8fc3 100644 ---- a/lib/engine/event_manager.h -+++ b/lib/engine/event_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EVENT_MANAGER_H__INCLUDED__ - #define __EVENT_MANAGER_H__INCLUDED__ -diff --git a/lib/engine/exception.h b/lib/engine/exception.h -index 171e45d..183ebb5 100644 ---- a/lib/engine/exception.h -+++ b/lib/engine/exception.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __EXCEPTION_H__INCLUDED__ - #define __EXCEPTION_H__INCLUDED__ -diff --git a/lib/engine/filesystem.h b/lib/engine/filesystem.h -index 9c2ce39..b49df07 100644 ---- a/lib/engine/filesystem.h -+++ b/lib/engine/filesystem.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __FILESYSTEM_H__INCLUDED__ - #define __FILESYSTEM_H__INCLUDED__ -diff --git a/lib/engine/isci.h b/lib/engine/isci.h -index ea35cd4..0fa602a 100644 ---- a/lib/engine/isci.h -+++ b/lib/engine/isci.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_H__INCLUDED__ - #define __ISCI_H__INCLUDED__ -diff --git a/lib/engine/isci_cdrom.h b/lib/engine/isci_cdrom.h -index 87b7e7b..25637f9 100644 ---- a/lib/engine/isci_cdrom.h -+++ b/lib/engine/isci_cdrom.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_CDROM_H__INCLUDED__ - #define __ISCI_CDROM_H__INCLUDED__ -diff --git a/lib/engine/isci_disk.h b/lib/engine/isci_disk.h -index 596c3cf..8dd0dae 100644 ---- a/lib/engine/isci_disk.h -+++ b/lib/engine/isci_disk.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_DISK_H__INCLUDED__ - #define __ISCI_DISK_H__INCLUDED__ -diff --git a/lib/engine/isci_expander.h b/lib/engine/isci_expander.h -index ca7c2f1..7dc1920 100644 ---- a/lib/engine/isci_expander.h -+++ b/lib/engine/isci_expander.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_EXPANDER_H__INCLUDED__ - #define __ISCI_EXPANDER_H__INCLUDED__ -diff --git a/lib/engine/isci_expander_phy.h b/lib/engine/isci_expander_phy.h -index c9cd770..d3d2832 100644 ---- a/lib/engine/isci_expander_phy.h -+++ b/lib/engine/isci_expander_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_EXPANDER_PHY_H__INCLUDED__ - #define __ISCI_EXPANDER_PHY_H__INCLUDED__ -diff --git a/lib/engine/isci_expander_port.h b/lib/engine/isci_expander_port.h -index e65a124..4fc9310 100644 ---- a/lib/engine/isci_expander_port.h -+++ b/lib/engine/isci_expander_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_EXPANDER_PORT_H__INCLUDED__ - #define __ISCI_EXPANDER_PORT_H__INCLUDED__ -diff --git a/lib/engine/isci_phy.h b/lib/engine/isci_phy.h -index 767a5b2..105c697 100644 ---- a/lib/engine/isci_phy.h -+++ b/lib/engine/isci_phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_PHY_H__INCLUDED__ - #define __ISCI_PHY_H__INCLUDED__ -diff --git a/lib/engine/isci_port.h b/lib/engine/isci_port.h -index b80be7f..5ccc151 100644 ---- a/lib/engine/isci_port.h -+++ b/lib/engine/isci_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_PORT_H__INCLUDED__ - #define __ISCI_PORT_H__INCLUDED__ -diff --git a/lib/engine/isci_raid_info.h b/lib/engine/isci_raid_info.h -index 1df6477..b0b046a 100644 ---- a/lib/engine/isci_raid_info.h -+++ b/lib/engine/isci_raid_info.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_RAID_INFO_H__INCLUDED__ - #define __ISCI_RAID_INFO_H__INCLUDED__ -diff --git a/lib/engine/isci_tape.h b/lib/engine/isci_tape.h -index 985f767..a2cef2d 100644 ---- a/lib/engine/isci_tape.h -+++ b/lib/engine/isci_tape.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ISCI_TAPE_H__INCLUDED__ - #define __ISCI_TAPE_H__INCLUDED__ -diff --git a/lib/engine/list.h b/lib/engine/list.h -index 9a7c3c3..6395830 100644 ---- a/lib/engine/list.h -+++ b/lib/engine/list.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __LIST_H__INCLUDED__ - #define __LIST_H__INCLUDED__ -diff --git a/lib/engine/mdadm_config.h b/lib/engine/mdadm_config.h -index c94020f..e415b4f 100644 ---- a/lib/engine/mdadm_config.h -+++ b/lib/engine/mdadm_config.h -@@ -11,9 +11,7 @@ Redistribution and use in source and binary forms, with or without modification, - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. - */ - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __MDADM_CONFIG_H__INCLUDED__ - #define __MDADM_CONFIG_H__INCLUDED__ -diff --git a/lib/engine/multimedia_device.h b/lib/engine/multimedia_device.h -index 533370e..694e2a5 100644 ---- a/lib/engine/multimedia_device.h -+++ b/lib/engine/multimedia_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __MULTIMEDIA_DEVICE_H__INCLUDED__ - #define __MULTIMEDIA_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/nondisk_device.h b/lib/engine/nondisk_device.h -index 70ebb32..0f00e52 100644 ---- a/lib/engine/nondisk_device.h -+++ b/lib/engine/nondisk_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __CHARACTER_DEVICE_H__INCLUDED__ - #define __CHARACTER_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/object.h b/lib/engine/object.h -index b52d3d3..345d58c 100644 ---- a/lib/engine/object.h -+++ b/lib/engine/object.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __OBJECT_H__INCLUDED__ - #define __OBJECT_H__INCLUDED__ -diff --git a/lib/engine/pci_header.h b/lib/engine/pci_header.h -index 376f296..c5129a0 100644 ---- a/lib/engine/pci_header.h -+++ b/lib/engine/pci_header.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __PCI_HEADER_H__INCLUDED__ - #define __PCI_HEADER_H__INCLUDED__ -diff --git a/lib/engine/phy.h b/lib/engine/phy.h -index f5730a0..c59f7c8 100644 ---- a/lib/engine/phy.h -+++ b/lib/engine/phy.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __PHY_H__INCLUDED__ - #define __PHY_H__INCLUDED__ -diff --git a/lib/engine/port.h b/lib/engine/port.h -index 2f33876..cc48c7c 100644 ---- a/lib/engine/port.h -+++ b/lib/engine/port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3,4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __PORT_H__INCLUDED__ - #define __PORT_H__INCLUDED__ -diff --git a/lib/engine/raid_device.h b/lib/engine/raid_device.h -index 998e80c..2174162 100644 ---- a/lib/engine/raid_device.h -+++ b/lib/engine/raid_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __RAID_DEVICE_H__INCLUDED__ - #define __RAID_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/raid_info.h b/lib/engine/raid_info.h -index 174698a..302be9b 100644 ---- a/lib/engine/raid_info.h -+++ b/lib/engine/raid_info.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __RAID_INFO_H__INCLUDED__ - #define __RAID_INFO_H__INCLUDED__ -diff --git a/lib/engine/remote_port.h b/lib/engine/remote_port.h -index c086656..4ddfee3 100644 ---- a/lib/engine/remote_port.h -+++ b/lib/engine/remote_port.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __REMOTE_PORT_H__INCLUDED__ - #define __REMOTE_PORT_H__INCLUDED__ -diff --git a/lib/engine/routing_device.h b/lib/engine/routing_device.h -index 5f857a6..284621e 100644 ---- a/lib/engine/routing_device.h -+++ b/lib/engine/routing_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ROUTING_DEVICE_H__INCLUDED__ - #define __ROUTING_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/session.h b/lib/engine/session.h -index a901d1c..3200da1 100644 ---- a/lib/engine/session.h -+++ b/lib/engine/session.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __SESSION_H__INCLUDED__ - #define __SESSION_H__INCLUDED__ -diff --git a/lib/engine/session_manager.h b/lib/engine/session_manager.h -index 7177064..87e16c3 100644 ---- a/lib/engine/session_manager.h -+++ b/lib/engine/session_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __SESSION_MANAGER_H__INCLUDED__ - #define __SESSION_MANAGER_H__INCLUDED__ -diff --git a/lib/engine/storage_device.h b/lib/engine/storage_device.h -index ddeb66f..20bdab2 100644 ---- a/lib/engine/storage_device.h -+++ b/lib/engine/storage_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __STORAGE_DEVICE_H__INCLUDED__ - #define __STORAGE_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/stream_device.h b/lib/engine/stream_device.h -index 9bc111a..b29bd68 100644 ---- a/lib/engine/stream_device.h -+++ b/lib/engine/stream_device.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __STREAM_DEVICE_H__INCLUDED__ - #define __STREAM_DEVICE_H__INCLUDED__ -diff --git a/lib/engine/string.h b/lib/engine/string.h -index 3007dc7..6f348c9 100644 ---- a/lib/engine/string.h -+++ b/lib/engine/string.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __STRING_H__INCLUDED__ - #define __STRING_H__INCLUDED__ -diff --git a/lib/engine/unique_id_manager.h b/lib/engine/unique_id_manager.h -index fe79eac..4a13627 100644 ---- a/lib/engine/unique_id_manager.h -+++ b/lib/engine/unique_id_manager.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __UNIQUE_ID_MANAGER_H__INCLUDED__ - #define __UNIQUE_ID_MANAGER_H__INCLUDED__ -diff --git a/lib/engine/utils.h b/lib/engine/utils.h -index 86c20cf..5525303 100644 ---- a/lib/engine/utils.h -+++ b/lib/engine/utils.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __UTILS_H__INCLUDED__ - #define __UTILS_H__INCLUDED__ -diff --git a/lib/engine/volume.h b/lib/engine/volume.h -index 9a63cbf..3347b31 100644 ---- a/lib/engine/volume.h -+++ b/lib/engine/volume.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - // Forward declarations - class Array; -diff --git a/lib/log/log.h b/lib/log/log.h -index c0bd63e..8b5f171 100644 ---- a/lib/log/log.h -+++ b/lib/log/log.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __LOG_H__INCLUDED__ - #define __LOG_H__INCLUDED__ -diff --git a/lib/mpb/machine_bytes.h b/lib/mpb/machine_bytes.h -index 7fbb0e9..800b120 100644 ---- a/lib/mpb/machine_bytes.h -+++ b/lib/mpb/machine_bytes.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __ENDIAN_H__INCLUDED__ - #define __ENDIAN_H__INCLUDED__ -diff --git a/lib/mpb/mpb.h b/lib/mpb/mpb.h -index 01782af..c42cdfb 100644 ---- a/lib/mpb/mpb.h -+++ b/lib/mpb/mpb.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __MPB_H__INCLUDED__ - #define __MPB_H__INCLUDED__ -diff --git a/lib/orom/orom.h b/lib/orom/orom.h -index f76e3ee..e10311d 100644 ---- a/lib/orom/orom.h -+++ b/lib/orom/orom.h -@@ -15,9 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - - - --#if __GNUC_PREREQ(3, 4) - #pragma once --#endif /* __GNUC_PREREQ */ - - #ifndef __OROM_H__INCLUDED__ - #define __OROM_H__INCLUDED__ --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch new file mode 100644 index 000000000..8fdbf3e60 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch @@ -0,0 +1,57 @@ +From 874da836bc857e5942675c59e19f4fd8ad09b13e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 14:08:19 -0700 +Subject: [PATCH 1/4] log: Avoid shadowing functions from std lib + +Signed-off-by: Khem Raj +--- + lib/log/log.c | 2 +- + lib/log/log.h | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/log/log.c b/lib/log/log.c +index 7d8e17c..18b67a5 100644 +--- a/lib/log/log.c ++++ b/lib/log/log.c +@@ -82,7 +82,7 @@ enum log_level log_get_level(void) { + } + + /* */ +-void __log(enum log_level level, const char *message) { ++void _ssiap_log(enum log_level level, const char *message) { + struct tm tm; + struct timeval tv; + +diff --git a/lib/log/log.h b/lib/log/log.h +index d94e482..66a707b 100644 +--- a/lib/log/log.h ++++ b/lib/log/log.h +@@ -53,13 +53,13 @@ enum log_level { + }; + + /* */ +-#define log(__level, __message) \ ++#define ssiap_log(__level, __message) \ + do { if (log_get_level() >= (enum log_level)(__level)) \ +- __log(__level, __message); \ ++ _ssiap_log(__level, __message); \ + } while (0) + + #define dlog(__message) \ +- log(LOG_DEBUG, __message); ++ ssiap_log(LOG_DEBUG, __message); + + /* */ + void log_init(enum log_level level, const char *path); +@@ -68,7 +68,7 @@ void log_init(enum log_level level, const char *path); + void log_fini(void); + + /* */ +-void __log(enum log_level level, const char *message); ++void _ssiap_log(enum log_level level, const char *message); + + /* */ + enum log_level log_get_level(void); +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch deleted file mode 100644 index 27df9b5de..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ea9ecf4bf305f9509d5822b3823658a40162f43c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 25 Jul 2017 19:08:21 -0700 -Subject: [PATCH] ssieventmonitor: ordered comparison between pointers and - zero, actually with NULL - -Comparing which is large or small between a pointer and NULL -however, looks completely illogical. Ordered comparison of -two valid pointers is legit, but no pointer will be smaller -than NULL , so comparing if a pointer is larger than NULL -simply means if the pointer is not NULL. - -Fixes errors found with clang e.g. - -| ssieventmonitor.cpp:339:53: error: ordered comparison between pointer and zero ('char *' and 'int') -| if (fgets(nextline, sizeof(nextline) - 1, mdstat) < 0) { -| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ - -Signed-off-by: Khem Raj ---- - tools/ssieventmonitor.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp -index f04b8f0..7a00122 100644 ---- a/tools/ssieventmonitor.cpp -+++ b/tools/ssieventmonitor.cpp -@@ -336,7 +336,7 @@ static int _read_mdstat(int fd) - if (!strncmp(line, "md", 2)) { - if (strstr(line, INACTIVE_STR)) { /* possibly container */ - char nextline[1024]; -- if (fgets(nextline, sizeof(nextline) - 1, mdstat) < 0) { -+ if (fgets(nextline, sizeof(nextline) - 1, mdstat) != (char *) NULL) { - fclose(mdstat); - return 1; - } --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch deleted file mode 100644 index 351301cdc..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 1338ee4e69c465f8f381ec3bfe5058080236edba Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Jun 2017 22:08:35 -0700 -Subject: [PATCH 2/6] Convert macros into functions - -This helps in fixing the security format warnings -add -fno-builtin-log - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - lib/engine/Makefile.am | 3 ++- - lib/log/Makefile.am | 2 ++ - lib/log/log.h | 34 +++++++++++++++++++++------------- - src/Makefile.am | 3 ++- - 4 files changed, 27 insertions(+), 15 deletions(-) - -Index: ssiapi.1.0.1/lib/engine/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/lib/engine/Makefile.am -+++ ssiapi.1.0.1/lib/engine/Makefile.am -@@ -113,4 +113,5 @@ libengine_la_SOURCES = \ - libengine_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/lib -+ -I$(top_srcdir)/lib \ -+ -fno-builtin-log -Index: ssiapi.1.0.1/lib/log/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/lib/log/Makefile.am -+++ ssiapi.1.0.1/lib/log/Makefile.am -@@ -5,3 +5,5 @@ noinst_LTLIBRARIES = liblog.la - liblog_la_SOURCES = \ - log.c \ - log.h -+ -+liblog_la_CPPFLAGS = -fno-builtin-log -Index: ssiapi.1.0.1/lib/log/log.h -=================================================================== ---- ssiapi.1.0.1.orig/lib/log/log.h -+++ ssiapi.1.0.1/lib/log/log.h -@@ -23,7 +23,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG - #if defined(__cplusplus) - extern "C" { - #endif /* __cplusplus */ -- -+#include - /* */ - enum log_level { - LOG_FIRST = 0, -@@ -37,26 +37,34 @@ enum log_level { - }; - - /* */ --#define log(__level, __format, ...) \ -- do { if (log_get_level() >= (enum log_level)(__level)) \ -- __log(__level, __format, ## __VA_ARGS__); \ -- } while (0) -- --#define dlog(__format, ...) \ -- log(LOG_DEBUG, __format, ## __VA_ARGS__); -+void __log(enum log_level level, const char *format, ...) -+ __attribute__((format(printf, 2, 3))); - - /* */ --void log_init(enum log_level level, const char *path); -+enum log_level log_get_level(void); - - /* */ --void log_fini(void); -- -+static inline void log(enum log_level __level, const char* __format, ...) { -+ va_list ap; -+ va_start(ap, __format); -+ do { -+ if (log_get_level() >= (enum log_level)(__level)) -+ __log(__level, __format, ap); -+ } while (0); -+ va_end(ap); -+} -+ -+static inline void dlog(const char* __format, ...) { -+ va_list ap; -+ va_start(ap, __format); -+ log(LOG_DEBUG, __format, ap); -+ va_end(ap); -+} - /* */ --void __log(enum log_level level, const char *format, ...) -- __attribute__((format(printf, 2, 3))); -+void log_init(enum log_level level, const char *path); - - /* */ --enum log_level log_get_level(void); -+void log_fini(void); - - /* */ - void log_set_level(enum log_level level); -Index: ssiapi.1.0.1/src/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/src/Makefile.am -+++ ssiapi.1.0.1/src/Makefile.am -@@ -7,7 +7,8 @@ lib_LTLIBRARIES = libssi.la - libssi_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/lib -+ -I$(top_srcdir)/lib \ -+ -fno-builtin-log - - libssi_la_LDFLAGS = \ - $(SGUTILS_LDFLAGS) \ -Index: ssiapi.1.0.1/lib/efi/Makefile.am -=================================================================== ---- ssiapi.1.0.1.orig/lib/efi/Makefile.am -+++ ssiapi.1.0.1/lib/efi/Makefile.am -@@ -5,3 +5,4 @@ noinst_LTLIBRARIES = libefi.la - libefi_la_SOURCES = \ - efi.cpp \ - efi.h -+libefi_la_CPPFLAGS = -fno-builtin-log diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch new file mode 100644 index 000000000..acc718d23 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch @@ -0,0 +1,54 @@ +From 01a75b23382fd042673d1f00fce708ba6c67d05a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 30 Aug 2019 13:12:54 -0700 +Subject: [PATCH] Use stangard int types + +__unitn_* are internal to GNU libc lets use portable types + +Fixes +error: unknown type name '__uint8_t' + +Signed-off-by: Khem Raj +--- + lib/engine/end_device.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/lib/engine/end_device.cpp b/lib/engine/end_device.cpp +index 5a66de9..da078bf 100644 +--- a/lib/engine/end_device.cpp ++++ b/lib/engine/end_device.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -90,20 +91,20 @@ using boost::shared_ptr; + + struct AtaCommand + { +- __uint8_t command; +- __uint8_t obsolete1; +- __uint8_t obsolete2; +- __uint8_t transportDependent; ++ uint8_t command; ++ uint8_t obsolete1; ++ uint8_t obsolete2; ++ uint8_t transportDependent; + }; + + struct AtaIdentifyCall + { + AtaCommand command; +- __uint16_t data[256]; ++ uint16_t data[256]; + }; + + namespace { +- __uint16_t swap(__uint16_t value) ++ uint16_t swap(uint16_t value) + { + return (value >> 8) | (value << 8); + } diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch new file mode 100644 index 000000000..2eeab54e5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch @@ -0,0 +1,1409 @@ +From ef90544f8df369781a6ef094330c9cfa9f0ee1e4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 14:09:11 -0700 +Subject: [PATCH 2/4] boost: Backport clang support + +backport headers from boost 1.59 + +Signed-off-by: Khem Raj +--- + lib/boost/config/compiler/clang.hpp | 272 +++++++++ + lib/boost/config/stdlib/libcpp.hpp | 80 +++ + lib/boost/cstdint.hpp | 542 ++++++++++++++++++ + .../detail/sp_counted_base_clang.hpp | 140 +++++ + 4 files changed, 1034 insertions(+) + create mode 100644 lib/boost/config/compiler/clang.hpp + create mode 100644 lib/boost/config/stdlib/libcpp.hpp + create mode 100644 lib/boost/cstdint.hpp + create mode 100644 lib/boost/smart_ptr/detail/sp_counted_base_clang.hpp + +--- /dev/null ++++ b/lib/boost/config/compiler/clang.hpp +@@ -0,0 +1,272 @@ ++ ++// (C) Copyright Douglas Gregor 2010 ++// ++// Use, modification and distribution are subject to the ++// Boost Software License, Version 1.0. (See accompanying file ++// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org for most recent version. ++ ++// Clang compiler setup. ++ ++#define BOOST_HAS_PRAGMA_ONCE ++ ++// Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined when that flag is used. ++#if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4)) ++# define BOOST_HAS_PRAGMA_DETECT_MISMATCH ++#endif ++ ++// When compiling with clang before __has_extension was defined, ++// even if one writes 'defined(__has_extension) && __has_extension(xxx)', ++// clang reports a compiler error. So the only workaround found is: ++ ++#ifndef __has_extension ++#define __has_extension __has_feature ++#endif ++ ++#if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS) ++# define BOOST_NO_EXCEPTIONS ++#endif ++ ++#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_RTTI) ++# define BOOST_NO_RTTI ++#endif ++ ++#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_TYPEID) ++# define BOOST_NO_TYPEID ++#endif ++ ++#if defined(__int64) && !defined(__GNUC__) ++# define BOOST_HAS_MS_INT64 ++#endif ++ ++#define BOOST_HAS_NRVO ++ ++// Branch prediction hints ++#if defined(__has_builtin) ++#if __has_builtin(__builtin_expect) ++#define BOOST_LIKELY(x) __builtin_expect(x, 1) ++#define BOOST_UNLIKELY(x) __builtin_expect(x, 0) ++#endif ++#endif ++ ++// Clang supports "long long" in all compilation modes. ++#define BOOST_HAS_LONG_LONG ++ ++// ++// We disable this if the compiler is really nvcc as it ++// doesn't actually support __int128 as of CUDA_VERSION=5000 ++// even though it defines __SIZEOF_INT128__. ++// See https://svn.boost.org/trac/boost/ticket/10418 ++// Only re-enable this for nvcc if you're absolutely sure ++// of the circumstances under which it's supported: ++// ++#if defined(__SIZEOF_INT128__) && !defined(__CUDACC__) ++# define BOOST_HAS_INT128 ++#endif ++ ++ ++// ++// Dynamic shared object (DSO) and dynamic-link library (DLL) support ++// ++#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) ++# define BOOST_SYMBOL_EXPORT __attribute__((__visibility__("default"))) ++# define BOOST_SYMBOL_IMPORT ++# define BOOST_SYMBOL_VISIBLE __attribute__((__visibility__("default"))) ++#endif ++ ++// ++// The BOOST_FALLTHROUGH macro can be used to annotate implicit fall-through ++// between switch labels. ++// ++#if __cplusplus >= 201103L && defined(__has_warning) ++# if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough") ++# define BOOST_FALLTHROUGH [[clang::fallthrough]] ++# endif ++#endif ++ ++#if !__has_feature(cxx_auto_type) ++# define BOOST_NO_CXX11_AUTO_DECLARATIONS ++# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS ++#endif ++ ++// ++// Currently clang on Windows using VC++ RTL does not support C++11's char16_t or char32_t ++// ++#if defined(_MSC_VER) || !(defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L) ++# define BOOST_NO_CXX11_CHAR16_T ++# define BOOST_NO_CXX11_CHAR32_T ++#endif ++ ++#if !__has_feature(cxx_constexpr) ++# define BOOST_NO_CXX11_CONSTEXPR ++#endif ++ ++#if !__has_feature(cxx_decltype) ++# define BOOST_NO_CXX11_DECLTYPE ++#endif ++ ++#if !__has_feature(cxx_decltype_incomplete_return_types) ++# define BOOST_NO_CXX11_DECLTYPE_N3276 ++#endif ++ ++#if !__has_feature(cxx_defaulted_functions) ++# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS ++#endif ++ ++#if !__has_feature(cxx_deleted_functions) ++# define BOOST_NO_CXX11_DELETED_FUNCTIONS ++#endif ++ ++#if !__has_feature(cxx_explicit_conversions) ++# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ++#endif ++ ++#if !__has_feature(cxx_default_function_template_args) ++# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS ++#endif ++ ++#if !__has_feature(cxx_generalized_initializers) ++# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST ++#endif ++ ++#if !__has_feature(cxx_lambdas) ++# define BOOST_NO_CXX11_LAMBDAS ++#endif ++ ++#if !__has_feature(cxx_local_type_template_args) ++# define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS ++#endif ++ ++#if !__has_feature(cxx_noexcept) ++# define BOOST_NO_CXX11_NOEXCEPT ++#endif ++ ++#if !__has_feature(cxx_nullptr) ++# define BOOST_NO_CXX11_NULLPTR ++#endif ++ ++#if !__has_feature(cxx_range_for) ++# define BOOST_NO_CXX11_RANGE_BASED_FOR ++#endif ++ ++#if !__has_feature(cxx_raw_string_literals) ++# define BOOST_NO_CXX11_RAW_LITERALS ++#endif ++ ++#if !__has_feature(cxx_reference_qualified_functions) ++# define BOOST_NO_CXX11_REF_QUALIFIERS ++#endif ++ ++#if !__has_feature(cxx_generalized_initializers) ++# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX ++#endif ++ ++#if !__has_feature(cxx_rvalue_references) ++# define BOOST_NO_CXX11_RVALUE_REFERENCES ++#endif ++ ++#if !__has_feature(cxx_strong_enums) ++# define BOOST_NO_CXX11_SCOPED_ENUMS ++#endif ++ ++#if !__has_feature(cxx_static_assert) ++# define BOOST_NO_CXX11_STATIC_ASSERT ++#endif ++ ++#if !__has_feature(cxx_alias_templates) ++# define BOOST_NO_CXX11_TEMPLATE_ALIASES ++#endif ++ ++#if !__has_feature(cxx_unicode_literals) ++# define BOOST_NO_CXX11_UNICODE_LITERALS ++#endif ++ ++#if !__has_feature(cxx_variadic_templates) ++# define BOOST_NO_CXX11_VARIADIC_TEMPLATES ++#endif ++ ++#if !__has_feature(cxx_user_literals) ++# define BOOST_NO_CXX11_USER_DEFINED_LITERALS ++#endif ++ ++#if !__has_feature(cxx_alignas) ++# define BOOST_NO_CXX11_ALIGNAS ++#endif ++ ++#if !__has_feature(cxx_trailing_return) ++# define BOOST_NO_CXX11_TRAILING_RESULT_TYPES ++#endif ++ ++#if !__has_feature(cxx_inline_namespaces) ++# define BOOST_NO_CXX11_INLINE_NAMESPACES ++#endif ++ ++#if !__has_feature(cxx_override_control) ++# define BOOST_NO_CXX11_FINAL ++#endif ++ ++#if !(__has_feature(__cxx_binary_literals__) || __has_extension(__cxx_binary_literals__)) ++# define BOOST_NO_CXX14_BINARY_LITERALS ++#endif ++ ++#if !__has_feature(__cxx_decltype_auto__) ++# define BOOST_NO_CXX14_DECLTYPE_AUTO ++#endif ++ ++#if !__has_feature(__cxx_aggregate_nsdmi__) ++# define BOOST_NO_CXX14_AGGREGATE_NSDMI ++#endif ++ ++#if !__has_feature(__cxx_init_captures__) ++# define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES ++#endif ++ ++#if !__has_feature(__cxx_generic_lambdas__) ++# define BOOST_NO_CXX14_GENERIC_LAMBDAS ++#endif ++ ++// clang < 3.5 has a defect with dependent type, like following. ++// ++// template ++// constexpr typename enable_if >::type foo(T &) ++// { } // error: no return statement in constexpr function ++// ++// This issue also affects C++11 mode, but C++11 constexpr requires return stmt. ++// Therefore we don't care such case. ++// ++// Note that we can't check Clang version directly as the numbering system changes depending who's ++// creating the Clang release (see https://github.com/boostorg/config/pull/39#issuecomment-59927873) ++// so instead verify that we have a feature that was introduced at the same time as working C++14 ++// constexpr (generic lambda's in this case): ++// ++#if !__has_feature(__cxx_generic_lambdas__) || !__has_feature(__cxx_relaxed_constexpr__) ++# define BOOST_NO_CXX14_CONSTEXPR ++#endif ++ ++#if !__has_feature(__cxx_return_type_deduction__) ++# define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION ++#endif ++ ++#if !__has_feature(__cxx_variable_templates__) ++# define BOOST_NO_CXX14_VARIABLE_TEMPLATES ++#endif ++ ++#if __cplusplus < 201400 ++// All versions with __cplusplus above this value seem to support this: ++# define BOOST_NO_CXX14_DIGIT_SEPARATORS ++#endif ++ ++ ++// Unused attribute: ++#if defined(__GNUC__) && (__GNUC__ >= 4) ++# define BOOST_ATTRIBUTE_UNUSED __attribute__((unused)) ++#endif ++ ++#ifndef BOOST_COMPILER ++# define BOOST_COMPILER "Clang version " __clang_version__ ++#endif ++ ++// Macro used to identify the Clang compiler. ++#define BOOST_CLANG 1 ++ +--- /dev/null ++++ b/lib/boost/config/stdlib/libcpp.hpp +@@ -0,0 +1,80 @@ ++// (C) Copyright Christopher Jefferson 2011. ++// Use, modification and distribution are subject to the ++// Boost Software License, Version 1.0. (See accompanying file ++// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org for most recent version. ++ ++// config for libc++ ++// Might need more in here later. ++ ++#if !defined(_LIBCPP_VERSION) ++# include ++# if !defined(_LIBCPP_VERSION) ++# error "This is not libc++!" ++# endif ++#endif ++ ++#define BOOST_STDLIB "libc++ version " BOOST_STRINGIZE(_LIBCPP_VERSION) ++ ++#define BOOST_HAS_THREADS ++ ++#ifdef _LIBCPP_HAS_NO_VARIADICS ++# define BOOST_NO_CXX11_HDR_TUPLE ++#endif ++ ++// BOOST_NO_CXX11_ALLOCATOR should imply no support for the C++11 ++// allocator model. The C++11 allocator model requires a conforming ++// std::allocator_traits which is only possible with C++11 template ++// aliases since members rebind_alloc and rebind_traits require it. ++#if defined(_LIBCPP_HAS_NO_TEMPLATE_ALIASES) ++# define BOOST_NO_CXX11_ALLOCATOR ++#endif ++ ++#if __cplusplus < 201103 ++# define BOOST_NO_CXX11_HDR_ARRAY ++# define BOOST_NO_CXX11_HDR_CODECVT ++# define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE ++# define BOOST_NO_CXX11_HDR_FORWARD_LIST ++# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST ++# define BOOST_NO_CXX11_HDR_MUTEX ++# define BOOST_NO_CXX11_HDR_RANDOM ++# define BOOST_NO_CXX11_HDR_RATIO ++# define BOOST_NO_CXX11_HDR_REGEX ++# define BOOST_NO_CXX11_HDR_SYSTEM_ERROR ++# define BOOST_NO_CXX11_HDR_THREAD ++# define BOOST_NO_CXX11_HDR_TUPLE ++# define BOOST_NO_CXX11_HDR_TYPEINDEX ++# define BOOST_NO_CXX11_HDR_UNORDERED_MAP ++# define BOOST_NO_CXX11_HDR_UNORDERED_SET ++# define BOOST_NO_CXX11_NUMERIC_LIMITS ++# define BOOST_NO_CXX11_ALLOCATOR ++# define BOOST_NO_CXX11_SMART_PTR ++# define BOOST_NO_CXX11_HDR_FUNCTIONAL ++# define BOOST_NO_CXX11_STD_ALIGN ++# define BOOST_NO_CXX11_ADDRESSOF ++#endif ++ ++// ++// These appear to be unusable/incomplete so far: ++// ++# define BOOST_NO_CXX11_HDR_CHRONO ++# define BOOST_NO_CXX11_HDR_FUTURE ++# define BOOST_NO_CXX11_HDR_TYPE_TRAITS ++# define BOOST_NO_CXX11_ATOMIC_SMART_PTR ++# define BOOST_NO_CXX11_HDR_ATOMIC ++ ++// libc++ uses a non-standard messages_base ++#define BOOST_NO_STD_MESSAGES ++ ++#if defined(__has_include) ++#if !__has_include() ++# define BOOST_NO_CXX14_HDR_SHARED_MUTEX ++#elif __cplusplus <= 201103 ++# define BOOST_NO_CXX14_HDR_SHARED_MUTEX ++#endif ++#elif __cplusplus < 201402 ++# define BOOST_NO_CXX14_HDR_SHARED_MUTEX ++#endif ++ ++// --- end --- +--- /dev/null ++++ b/lib/boost/cstdint.hpp +@@ -0,0 +1,542 @@ ++// boost cstdint.hpp header file ------------------------------------------// ++ ++// (C) Copyright Beman Dawes 1999. ++// (C) Copyright Jens Mauer 2001 ++// (C) Copyright John Maddock 2001 ++// Distributed under the Boost ++// Software License, Version 1.0. (See accompanying file ++// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org/libs/integer for documentation. ++ ++// Revision History ++// 31 Oct 01 use BOOST_HAS_LONG_LONG to check for "long long" (Jens M.) ++// 16 Apr 01 check LONGLONG_MAX when looking for "long long" (Jens Maurer) ++// 23 Jan 01 prefer "long" over "int" for int32_t and intmax_t (Jens Maurer) ++// 12 Nov 00 Merged (Jens Maurer) ++// 23 Sep 00 Added INTXX_C macro support (John Maddock). ++// 22 Sep 00 Better 64-bit support (John Maddock) ++// 29 Jun 00 Reimplement to avoid including stdint.h within namespace boost ++// 8 Aug 99 Initial version (Beman Dawes) ++ ++ ++#ifndef BOOST_CSTDINT_HPP ++#define BOOST_CSTDINT_HPP ++ ++// ++// Since we always define the INT#_C macros as per C++0x, ++// define __STDC_CONSTANT_MACROS so that does the right ++// thing if possible, and so that the user knows that the macros ++// are actually defined as per C99. ++// ++#ifndef __STDC_CONSTANT_MACROS ++# define __STDC_CONSTANT_MACROS ++#endif ++ ++#include ++ ++// ++// Note that GLIBC is a bit inconsistent about whether int64_t is defined or not ++// depending upon what headers happen to have been included first... ++// so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. ++// See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 ++// ++#if defined(BOOST_HAS_STDINT_H) \ ++ && (!defined(__GLIBC__) \ ++ || defined(__GLIBC_HAVE_LONG_LONG) \ ++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) ++ ++// The following #include is an implementation artifact; not part of interface. ++# ifdef __hpux ++// HP-UX has a vaguely nice in a non-standard location ++# include ++# ifdef __STDC_32_MODE__ ++ // this is triggered with GCC, because it defines __cplusplus < 199707L ++# define BOOST_NO_INT64_T ++# endif ++# elif defined(__FreeBSD__) || defined(__IBMCPP__) || defined(_AIX) ++# include ++# else ++# include ++ ++// There is a bug in Cygwin two _C macros ++# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__) ++# undef INTMAX_C ++# undef UINTMAX_C ++# define INTMAX_C(c) c##LL ++# define UINTMAX_C(c) c##ULL ++# endif ++ ++# endif ++ ++#ifdef __QNX__ ++ ++// QNX (Dinkumware stdlib) defines these as non-standard names. ++// Reflect to the standard names. ++ ++typedef ::intleast8_t int_least8_t; ++typedef ::intfast8_t int_fast8_t; ++typedef ::uintleast8_t uint_least8_t; ++typedef ::uintfast8_t uint_fast8_t; ++ ++typedef ::intleast16_t int_least16_t; ++typedef ::intfast16_t int_fast16_t; ++typedef ::uintleast16_t uint_least16_t; ++typedef ::uintfast16_t uint_fast16_t; ++ ++typedef ::intleast32_t int_least32_t; ++typedef ::intfast32_t int_fast32_t; ++typedef ::uintleast32_t uint_least32_t; ++typedef ::uintfast32_t uint_fast32_t; ++ ++# ifndef BOOST_NO_INT64_T ++ ++typedef ::intleast64_t int_least64_t; ++typedef ::intfast64_t int_fast64_t; ++typedef ::uintleast64_t uint_least64_t; ++typedef ::uintfast64_t uint_fast64_t; ++ ++# endif ++ ++#endif ++ ++namespace boost ++{ ++ ++ using ::int8_t; ++ using ::int_least8_t; ++ using ::int_fast8_t; ++ using ::uint8_t; ++ using ::uint_least8_t; ++ using ::uint_fast8_t; ++ ++ using ::int16_t; ++ using ::int_least16_t; ++ using ::int_fast16_t; ++ using ::uint16_t; ++ using ::uint_least16_t; ++ using ::uint_fast16_t; ++ ++ using ::int32_t; ++ using ::int_least32_t; ++ using ::int_fast32_t; ++ using ::uint32_t; ++ using ::uint_least32_t; ++ using ::uint_fast32_t; ++ ++# ifndef BOOST_NO_INT64_T ++ ++ using ::int64_t; ++ using ::int_least64_t; ++ using ::int_fast64_t; ++ using ::uint64_t; ++ using ::uint_least64_t; ++ using ::uint_fast64_t; ++ ++# endif ++ ++ using ::intmax_t; ++ using ::uintmax_t; ++ ++} // namespace boost ++ ++#elif defined(__FreeBSD__) && (__FreeBSD__ <= 4) || defined(__osf__) || defined(__VMS) || defined(__SOLARIS9__) || defined(__NetBSD__) ++// FreeBSD and Tru64 have an that contains much of what we need. ++# include ++ ++namespace boost { ++ ++ using ::int8_t; ++ typedef int8_t int_least8_t; ++ typedef int8_t int_fast8_t; ++ using ::uint8_t; ++ typedef uint8_t uint_least8_t; ++ typedef uint8_t uint_fast8_t; ++ ++ using ::int16_t; ++ typedef int16_t int_least16_t; ++ typedef int16_t int_fast16_t; ++ using ::uint16_t; ++ typedef uint16_t uint_least16_t; ++ typedef uint16_t uint_fast16_t; ++ ++ using ::int32_t; ++ typedef int32_t int_least32_t; ++ typedef int32_t int_fast32_t; ++ using ::uint32_t; ++ typedef uint32_t uint_least32_t; ++ typedef uint32_t uint_fast32_t; ++ ++# ifndef BOOST_NO_INT64_T ++ ++ using ::int64_t; ++ typedef int64_t int_least64_t; ++ typedef int64_t int_fast64_t; ++ using ::uint64_t; ++ typedef uint64_t uint_least64_t; ++ typedef uint64_t uint_fast64_t; ++ ++ typedef int64_t intmax_t; ++ typedef uint64_t uintmax_t; ++ ++# else ++ ++ typedef int32_t intmax_t; ++ typedef uint32_t uintmax_t; ++ ++# endif ++ ++} // namespace boost ++ ++#else // BOOST_HAS_STDINT_H ++ ++# include // implementation artifact; not part of interface ++# include // needed for limits macros ++ ++ ++namespace boost ++{ ++ ++// These are fairly safe guesses for some 16-bit, and most 32-bit and 64-bit ++// platforms. For other systems, they will have to be hand tailored. ++// ++// Because the fast types are assumed to be the same as the undecorated types, ++// it may be possible to hand tailor a more efficient implementation. Such ++// an optimization may be illusionary; on the Intel x86-family 386 on, for ++// example, byte arithmetic and load/stores are as fast as "int" sized ones. ++ ++// 8-bit types ------------------------------------------------------------// ++ ++# if UCHAR_MAX == 0xff ++ typedef signed char int8_t; ++ typedef signed char int_least8_t; ++ typedef signed char int_fast8_t; ++ typedef unsigned char uint8_t; ++ typedef unsigned char uint_least8_t; ++ typedef unsigned char uint_fast8_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++// 16-bit types -----------------------------------------------------------// ++ ++# if USHRT_MAX == 0xffff ++# if defined(__crayx1) ++ // The Cray X1 has a 16-bit short, however it is not recommend ++ // for use in performance critical code. ++ typedef short int16_t; ++ typedef short int_least16_t; ++ typedef int int_fast16_t; ++ typedef unsigned short uint16_t; ++ typedef unsigned short uint_least16_t; ++ typedef unsigned int uint_fast16_t; ++# else ++ typedef short int16_t; ++ typedef short int_least16_t; ++ typedef short int_fast16_t; ++ typedef unsigned short uint16_t; ++ typedef unsigned short uint_least16_t; ++ typedef unsigned short uint_fast16_t; ++# endif ++# elif (USHRT_MAX == 0xffffffff) && defined(__MTA__) ++ // On MTA / XMT short is 32 bits unless the -short16 compiler flag is specified ++ // MTA / XMT does support the following non-standard integer types ++ typedef __short16 int16_t; ++ typedef __short16 int_least16_t; ++ typedef __short16 int_fast16_t; ++ typedef unsigned __short16 uint16_t; ++ typedef unsigned __short16 uint_least16_t; ++ typedef unsigned __short16 uint_fast16_t; ++# elif (USHRT_MAX == 0xffffffff) && defined(CRAY) ++ // no 16-bit types on Cray: ++ typedef short int_least16_t; ++ typedef short int_fast16_t; ++ typedef unsigned short uint_least16_t; ++ typedef unsigned short uint_fast16_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++// 32-bit types -----------------------------------------------------------// ++ ++# if UINT_MAX == 0xffffffff ++ typedef int int32_t; ++ typedef int int_least32_t; ++ typedef int int_fast32_t; ++ typedef unsigned int uint32_t; ++ typedef unsigned int uint_least32_t; ++ typedef unsigned int uint_fast32_t; ++# elif (USHRT_MAX == 0xffffffff) ++ typedef short int32_t; ++ typedef short int_least32_t; ++ typedef short int_fast32_t; ++ typedef unsigned short uint32_t; ++ typedef unsigned short uint_least32_t; ++ typedef unsigned short uint_fast32_t; ++# elif ULONG_MAX == 0xffffffff ++ typedef long int32_t; ++ typedef long int_least32_t; ++ typedef long int_fast32_t; ++ typedef unsigned long uint32_t; ++ typedef unsigned long uint_least32_t; ++ typedef unsigned long uint_fast32_t; ++# elif (UINT_MAX == 0xffffffffffffffff) && defined(__MTA__) ++ // Integers are 64 bits on the MTA / XMT ++ typedef __int32 int32_t; ++ typedef __int32 int_least32_t; ++ typedef __int32 int_fast32_t; ++ typedef unsigned __int32 uint32_t; ++ typedef unsigned __int32 uint_least32_t; ++ typedef unsigned __int32 uint_fast32_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++// 64-bit types + intmax_t and uintmax_t ----------------------------------// ++ ++# if defined(BOOST_HAS_LONG_LONG) && \ ++ !defined(BOOST_MSVC) && !defined(__BORLANDC__) && \ ++ (!defined(__GLIBCPP__) || defined(_GLIBCPP_USE_LONG_LONG)) && \ ++ (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)) ++# if defined(__hpux) ++ // HP-UX's value of ULONG_LONG_MAX is unusable in preprocessor expressions ++# elif (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615ULL) || (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615ULL) || (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615ULL) ++ // 2**64 - 1 ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++ typedef ::boost::long_long_type intmax_t; ++ typedef ::boost::ulong_long_type uintmax_t; ++ typedef ::boost::long_long_type int64_t; ++ typedef ::boost::long_long_type int_least64_t; ++ typedef ::boost::long_long_type int_fast64_t; ++ typedef ::boost::ulong_long_type uint64_t; ++ typedef ::boost::ulong_long_type uint_least64_t; ++ typedef ::boost::ulong_long_type uint_fast64_t; ++ ++# elif ULONG_MAX != 0xffffffff ++ ++# if ULONG_MAX == 18446744073709551615 // 2**64 - 1 ++ typedef long intmax_t; ++ typedef unsigned long uintmax_t; ++ typedef long int64_t; ++ typedef long int_least64_t; ++ typedef long int_fast64_t; ++ typedef unsigned long uint64_t; ++ typedef unsigned long uint_least64_t; ++ typedef unsigned long uint_fast64_t; ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# elif defined(__GNUC__) && defined(BOOST_HAS_LONG_LONG) ++ __extension__ typedef long long intmax_t; ++ __extension__ typedef unsigned long long uintmax_t; ++ __extension__ typedef long long int64_t; ++ __extension__ typedef long long int_least64_t; ++ __extension__ typedef long long int_fast64_t; ++ __extension__ typedef unsigned long long uint64_t; ++ __extension__ typedef unsigned long long uint_least64_t; ++ __extension__ typedef unsigned long long uint_fast64_t; ++# elif defined(BOOST_HAS_MS_INT64) ++ // ++ // we have Borland/Intel/Microsoft __int64: ++ // ++ typedef __int64 intmax_t; ++ typedef unsigned __int64 uintmax_t; ++ typedef __int64 int64_t; ++ typedef __int64 int_least64_t; ++ typedef __int64 int_fast64_t; ++ typedef unsigned __int64 uint64_t; ++ typedef unsigned __int64 uint_least64_t; ++ typedef unsigned __int64 uint_fast64_t; ++# else // assume no 64-bit integers ++# define BOOST_NO_INT64_T ++ typedef int32_t intmax_t; ++ typedef uint32_t uintmax_t; ++# endif ++ ++} // namespace boost ++ ++ ++#endif // BOOST_HAS_STDINT_H ++ ++// intptr_t/uintptr_t are defined separately because they are optional and not universally available ++#if defined(BOOST_WINDOWS) && !defined(_WIN32_WCE) && !defined(BOOST_HAS_STDINT_H) ++// Older MSVC don't have stdint.h and have intptr_t/uintptr_t defined in stddef.h ++#include ++#endif ++ ++// PGI seems to not support intptr_t/uintptr_t properly. BOOST_HAS_STDINT_H is not defined for this compiler by Boost.Config. ++#if !defined(__PGIC__) ++ ++#if (defined(BOOST_WINDOWS) && !defined(_WIN32_WCE)) \ ++ || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__)) \ ++ || defined(__CYGWIN__) \ ++ || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ ++ || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun) ++ ++namespace boost { ++ using ::intptr_t; ++ using ::uintptr_t; ++} ++#define BOOST_HAS_INTPTR_T ++ ++// Clang pretends to be GCC, so it'll match this condition ++#elif defined(__GNUC__) && defined(__INTPTR_TYPE__) && defined(__UINTPTR_TYPE__) ++ ++namespace boost { ++ typedef __INTPTR_TYPE__ intptr_t; ++ typedef __UINTPTR_TYPE__ uintptr_t; ++} ++#define BOOST_HAS_INTPTR_T ++ ++#endif ++ ++#endif // !defined(__PGIC__) ++ ++#endif // BOOST_CSTDINT_HPP ++ ++ ++/**************************************************** ++ ++Macro definition section: ++ ++Added 23rd September 2000 (John Maddock). ++Modified 11th September 2001 to be excluded when ++BOOST_HAS_STDINT_H is defined (John Maddock). ++Modified 11th Dec 2009 to always define the ++INT#_C macros if they're not already defined (John Maddock). ++ ++******************************************************/ ++ ++#if !defined(BOOST__STDC_CONSTANT_MACROS_DEFINED) && \ ++ (!defined(INT8_C) || !defined(INT16_C) || !defined(INT32_C) || !defined(INT64_C)) ++// ++// For the following code we get several warnings along the lines of: ++// ++// boost/cstdint.hpp:428:35: error: use of C99 long long integer constant ++// ++// So we declare this a system header to suppress these warnings. ++// ++#if defined(__GNUC__) && (__GNUC__ >= 4) ++#pragma GCC system_header ++#endif ++ ++#include ++# define BOOST__STDC_CONSTANT_MACROS_DEFINED ++# if defined(BOOST_HAS_MS_INT64) ++// ++// Borland/Intel/Microsoft compilers have width specific suffixes: ++// ++#ifndef INT8_C ++# define INT8_C(value) value##i8 ++#endif ++#ifndef INT16_C ++# define INT16_C(value) value##i16 ++#endif ++#ifndef INT32_C ++# define INT32_C(value) value##i32 ++#endif ++#ifndef INT64_C ++# define INT64_C(value) value##i64 ++#endif ++# ifdef __BORLANDC__ ++ // Borland bug: appending ui8 makes the type a signed char ++# define UINT8_C(value) static_cast(value##u) ++# else ++# define UINT8_C(value) value##ui8 ++# endif ++#ifndef UINT16_C ++# define UINT16_C(value) value##ui16 ++#endif ++#ifndef UINT32_C ++# define UINT32_C(value) value##ui32 ++#endif ++#ifndef UINT64_C ++# define UINT64_C(value) value##ui64 ++#endif ++#ifndef INTMAX_C ++# define INTMAX_C(value) value##i64 ++# define UINTMAX_C(value) value##ui64 ++#endif ++ ++# else ++// do it the old fashioned way: ++ ++// 8-bit types ------------------------------------------------------------// ++ ++# if (UCHAR_MAX == 0xff) && !defined(INT8_C) ++# define INT8_C(value) static_cast(value) ++# define UINT8_C(value) static_cast(value##u) ++# endif ++ ++// 16-bit types -----------------------------------------------------------// ++ ++# if (USHRT_MAX == 0xffff) && !defined(INT16_C) ++# define INT16_C(value) static_cast(value) ++# define UINT16_C(value) static_cast(value##u) ++# endif ++ ++// 32-bit types -----------------------------------------------------------// ++#ifndef INT32_C ++# if (UINT_MAX == 0xffffffff) ++# define INT32_C(value) value ++# define UINT32_C(value) value##u ++# elif ULONG_MAX == 0xffffffff ++# define INT32_C(value) value##L ++# define UINT32_C(value) value##uL ++# endif ++#endif ++ ++// 64-bit types + intmax_t and uintmax_t ----------------------------------// ++#ifndef INT64_C ++# if defined(BOOST_HAS_LONG_LONG) && \ ++ (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX) || defined(_ULLONG_MAX) || defined(_LLONG_MAX)) ++ ++# if defined(__hpux) ++ // HP-UX's value of ULONG_LONG_MAX is unusable in preprocessor expressions ++# define INT64_C(value) value##LL ++# define UINT64_C(value) value##uLL ++# elif (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615ULL) || \ ++ (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615ULL) || \ ++ (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615ULL) || \ ++ (defined(_ULLONG_MAX) && _ULLONG_MAX == 18446744073709551615ULL) || \ ++ (defined(_LLONG_MAX) && _LLONG_MAX == 9223372036854775807LL) ++ ++# define INT64_C(value) value##LL ++# define UINT64_C(value) value##uLL ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# elif ULONG_MAX != 0xffffffff ++ ++# if ULONG_MAX == 18446744073709551615U // 2**64 - 1 ++# define INT64_C(value) value##L ++# define UINT64_C(value) value##uL ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# elif defined(BOOST_HAS_LONG_LONG) ++ // Usual macros not defined, work things out for ourselves: ++# if(~0uLL == 18446744073709551615ULL) ++# define INT64_C(value) value##LL ++# define UINT64_C(value) value##uLL ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++# else ++# error defaults not correct; you must hand modify boost/cstdint.hpp ++# endif ++ ++# ifdef BOOST_NO_INT64_T ++# define INTMAX_C(value) INT32_C(value) ++# define UINTMAX_C(value) UINT32_C(value) ++# else ++# define INTMAX_C(value) INT64_C(value) ++# define UINTMAX_C(value) UINT64_C(value) ++# endif ++#endif ++# endif // Borland/Microsoft specific width suffixes ++ ++#endif // INT#_C macros. +--- /dev/null ++++ b/lib/boost/smart_ptr/detail/sp_counted_base_clang.hpp +@@ -0,0 +1,140 @@ ++#ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_CLANG_HPP_INCLUDED ++#define BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_CLANG_HPP_INCLUDED ++ ++// MS compatible compilers support #pragma once ++ ++#if defined(_MSC_VER) && (_MSC_VER >= 1020) ++# pragma once ++#endif ++ ++// detail/sp_counted_base_clang.hpp - __c11 clang intrinsics ++// ++// Copyright (c) 2007, 2013, 2015 Peter Dimov ++// ++// Distributed under the Boost Software License, Version 1.0. ++// See accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt ++ ++#include ++#include ++ ++namespace boost ++{ ++ ++namespace detail ++{ ++ ++typedef _Atomic( boost::int_least32_t ) atomic_int_least32_t; ++ ++inline void atomic_increment( atomic_int_least32_t * pw ) ++{ ++ __c11_atomic_fetch_add( pw, 1, __ATOMIC_RELAXED ); ++} ++ ++inline boost::int_least32_t atomic_decrement( atomic_int_least32_t * pw ) ++{ ++ return __c11_atomic_fetch_sub( pw, 1, __ATOMIC_ACQ_REL ); ++} ++ ++inline boost::int_least32_t atomic_conditional_increment( atomic_int_least32_t * pw ) ++{ ++ // long r = *pw; ++ // if( r != 0 ) ++*pw; ++ // return r; ++ ++ boost::int_least32_t r = __c11_atomic_load( pw, __ATOMIC_RELAXED ); ++ ++ for( ;; ) ++ { ++ if( r == 0 ) ++ { ++ return r; ++ } ++ ++ if( __c11_atomic_compare_exchange_weak( pw, &r, r + 1, __ATOMIC_RELAXED, __ATOMIC_RELAXED ) ) ++ { ++ return r; ++ } ++ } ++} ++ ++class sp_counted_base ++{ ++private: ++ ++ sp_counted_base( sp_counted_base const & ); ++ sp_counted_base & operator= ( sp_counted_base const & ); ++ ++ atomic_int_least32_t use_count_; // #shared ++ atomic_int_least32_t weak_count_; // #weak + (#shared != 0) ++ ++public: ++ ++ sp_counted_base() ++ { ++ __c11_atomic_init( &use_count_, 1 ); ++ __c11_atomic_init( &weak_count_, 1 ); ++ } ++ ++ virtual ~sp_counted_base() // nothrow ++ { ++ } ++ ++ // dispose() is called when use_count_ drops to zero, to release ++ // the resources managed by *this. ++ ++ virtual void dispose() = 0; // nothrow ++ ++ // destroy() is called when weak_count_ drops to zero. ++ ++ virtual void destroy() // nothrow ++ { ++ delete this; ++ } ++ ++ virtual void * get_deleter( sp_typeinfo const & ti ) = 0; ++ virtual void * get_untyped_deleter() = 0; ++ ++ void add_ref_copy() ++ { ++ atomic_increment( &use_count_ ); ++ } ++ ++ bool add_ref_lock() // true on success ++ { ++ return atomic_conditional_increment( &use_count_ ) != 0; ++ } ++ ++ void release() // nothrow ++ { ++ if( atomic_decrement( &use_count_ ) == 1 ) ++ { ++ dispose(); ++ weak_release(); ++ } ++ } ++ ++ void weak_add_ref() // nothrow ++ { ++ atomic_increment( &weak_count_ ); ++ } ++ ++ void weak_release() // nothrow ++ { ++ if( atomic_decrement( &weak_count_ ) == 1 ) ++ { ++ destroy(); ++ } ++ } ++ ++ long use_count() const // nothrow ++ { ++ return __c11_atomic_load( const_cast< atomic_int_least32_t* >( &use_count_ ), __ATOMIC_ACQUIRE ); ++ } ++}; ++ ++} // namespace detail ++ ++} // namespace boost ++ ++#endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_CLANG_HPP_INCLUDED +--- /dev/null ++++ b/lib/boost/smart_ptr/detail/sp_counted_base_sync.hpp +@@ -0,0 +1,156 @@ ++#ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_SYNC_HPP_INCLUDED ++#define BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_SYNC_HPP_INCLUDED ++ ++// MS compatible compilers support #pragma once ++ ++#if defined(_MSC_VER) && (_MSC_VER >= 1020) ++# pragma once ++#endif ++ ++// detail/sp_counted_base_sync.hpp - g++ 4.1+ __sync intrinsics ++// ++// Copyright (c) 2007 Peter Dimov ++// ++// Distributed under the Boost Software License, Version 1.0. ++// See accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt ++ ++#include ++#include ++ ++#if defined( __ia64__ ) && defined( __INTEL_COMPILER ) ++# include ++#endif ++ ++namespace boost ++{ ++ ++namespace detail ++{ ++ ++#if INT_MAX >= 2147483647 ++ ++typedef int sp_int32_t; ++ ++#else ++ ++typedef long sp_int32_t; ++ ++#endif ++ ++inline void atomic_increment( sp_int32_t * pw ) ++{ ++ __sync_fetch_and_add( pw, 1 ); ++} ++ ++inline sp_int32_t atomic_decrement( sp_int32_t * pw ) ++{ ++ return __sync_fetch_and_add( pw, -1 ); ++} ++ ++inline sp_int32_t atomic_conditional_increment( sp_int32_t * pw ) ++{ ++ // long r = *pw; ++ // if( r != 0 ) ++*pw; ++ // return r; ++ ++ sp_int32_t r = *pw; ++ ++ for( ;; ) ++ { ++ if( r == 0 ) ++ { ++ return r; ++ } ++ ++ sp_int32_t r2 = __sync_val_compare_and_swap( pw, r, r + 1 ); ++ ++ if( r2 == r ) ++ { ++ return r; ++ } ++ else ++ { ++ r = r2; ++ } ++ } ++} ++ ++class sp_counted_base ++{ ++private: ++ ++ sp_counted_base( sp_counted_base const & ); ++ sp_counted_base & operator= ( sp_counted_base const & ); ++ ++ sp_int32_t use_count_; // #shared ++ sp_int32_t weak_count_; // #weak + (#shared != 0) ++ ++public: ++ ++ sp_counted_base(): use_count_( 1 ), weak_count_( 1 ) ++ { ++ } ++ ++ virtual ~sp_counted_base() // nothrow ++ { ++ } ++ ++ // dispose() is called when use_count_ drops to zero, to release ++ // the resources managed by *this. ++ ++ virtual void dispose() = 0; // nothrow ++ ++ // destroy() is called when weak_count_ drops to zero. ++ ++ virtual void destroy() // nothrow ++ { ++ delete this; ++ } ++ ++ virtual void * get_deleter( sp_typeinfo const & ti ) = 0; ++ virtual void * get_untyped_deleter() = 0; ++ ++ void add_ref_copy() ++ { ++ atomic_increment( &use_count_ ); ++ } ++ ++ bool add_ref_lock() // true on success ++ { ++ return atomic_conditional_increment( &use_count_ ) != 0; ++ } ++ ++ void release() // nothrow ++ { ++ if( atomic_decrement( &use_count_ ) == 1 ) ++ { ++ dispose(); ++ weak_release(); ++ } ++ } ++ ++ void weak_add_ref() // nothrow ++ { ++ atomic_increment( &weak_count_ ); ++ } ++ ++ void weak_release() // nothrow ++ { ++ if( atomic_decrement( &weak_count_ ) == 1 ) ++ { ++ destroy(); ++ } ++ } ++ ++ long use_count() const // nothrow ++ { ++ return const_cast< sp_int32_t const volatile & >( use_count_ ); ++ } ++}; ++ ++} // namespace detail ++ ++} // namespace boost ++ ++#endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_COUNTED_BASE_SYNC_HPP_INCLUDED +--- /dev/null ++++ b/lib/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +@@ -0,0 +1,182 @@ ++#ifndef BOOST_DETAIL_SP_COUNTED_BASE_GCC_MIPS_HPP_INCLUDED ++#define BOOST_DETAIL_SP_COUNTED_BASE_GCC_MIPS_HPP_INCLUDED ++ ++// MS compatible compilers support #pragma once ++ ++#if defined(_MSC_VER) && (_MSC_VER >= 1020) ++# pragma once ++#endif ++ ++// ++// detail/sp_counted_base_gcc_mips.hpp - g++ on MIPS ++// ++// Copyright (c) 2009, Spirent Communications, Inc. ++// ++// Distributed under the Boost Software License, Version 1.0. (See ++// accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt) ++// ++// ++// Lock-free algorithm by Alexander Terekhov ++// ++ ++#include ++ ++namespace boost ++{ ++ ++namespace detail ++{ ++ ++inline void atomic_increment( int * pw ) ++{ ++ // ++*pw; ++ ++ int tmp; ++ ++ __asm__ __volatile__ ++ ( ++ "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" ++ "ll %0, %1\n\t" ++ "addiu %0, 1\n\t" ++ "sc %0, %1\n\t" ++ ".set pop\n\t" ++ "beqz %0, 0b": ++ "=&r"( tmp ), "=m"( *pw ): ++ "m"( *pw ) ++ ); ++} ++ ++inline int atomic_decrement( int * pw ) ++{ ++ // return --*pw; ++ ++ int rv, tmp; ++ ++ __asm__ __volatile__ ++ ( ++ "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" ++ "ll %1, %2\n\t" ++ "addiu %0, %1, -1\n\t" ++ "sc %0, %2\n\t" ++ ".set pop\n\t" ++ "beqz %0, 0b\n\t" ++ "addiu %0, %1, -1": ++ "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ): ++ "m"( *pw ): ++ "memory" ++ ); ++ ++ return rv; ++} ++ ++inline int atomic_conditional_increment( int * pw ) ++{ ++ // if( *pw != 0 ) ++*pw; ++ // return *pw; ++ ++ int rv, tmp; ++ ++ __asm__ __volatile__ ++ ( ++ "0:\n\t" ++ ".set push\n\t" ++ ".set mips2\n\t" ++ "ll %0, %2\n\t" ++ "beqz %0, 1f\n\t" ++ "addiu %1, %0, 1\n\t" ++ "sc %1, %2\n\t" ++ ".set pop\n\t" ++ "beqz %1, 0b\n\t" ++ "addiu %0, %0, 1\n\t" ++ "1:": ++ "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ): ++ "m"( *pw ): ++ "memory" ++ ); ++ ++ return rv; ++} ++ ++class sp_counted_base ++{ ++private: ++ ++ sp_counted_base( sp_counted_base const & ); ++ sp_counted_base & operator= ( sp_counted_base const & ); ++ ++ int use_count_; // #shared ++ int weak_count_; // #weak + (#shared != 0) ++ ++public: ++ ++ sp_counted_base(): use_count_( 1 ), weak_count_( 1 ) ++ { ++ } ++ ++ virtual ~sp_counted_base() // nothrow ++ { ++ } ++ ++ // dispose() is called when use_count_ drops to zero, to release ++ // the resources managed by *this. ++ ++ virtual void dispose() = 0; // nothrow ++ ++ // destroy() is called when weak_count_ drops to zero. ++ ++ virtual void destroy() // nothrow ++ { ++ delete this; ++ } ++ ++ virtual void * get_deleter( sp_typeinfo const & ti ) = 0; ++ virtual void * get_untyped_deleter() = 0; ++ ++ void add_ref_copy() ++ { ++ atomic_increment( &use_count_ ); ++ } ++ ++ bool add_ref_lock() // true on success ++ { ++ return atomic_conditional_increment( &use_count_ ) != 0; ++ } ++ ++ void release() // nothrow ++ { ++ if( atomic_decrement( &use_count_ ) == 0 ) ++ { ++ dispose(); ++ weak_release(); ++ } ++ } ++ ++ void weak_add_ref() // nothrow ++ { ++ atomic_increment( &weak_count_ ); ++ } ++ ++ void weak_release() // nothrow ++ { ++ if( atomic_decrement( &weak_count_ ) == 0 ) ++ { ++ destroy(); ++ } ++ } ++ ++ long use_count() const // nothrow ++ { ++ return static_cast( use_count_ ); ++ } ++}; ++ ++} // namespace detail ++ ++} // namespace boost ++ ++#endif // #ifndef BOOST_DETAIL_SP_COUNTED_BASE_GCC_MIPS_HPP_INCLUDED diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch deleted file mode 100644 index 98cd40c84..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 781288d6307002cce70ddafb6efb200b7f60294d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Jun 2017 22:12:43 -0700 -Subject: [PATCH 3/6] Replace canonicalize_file_name with realpath() API - -Fixed build on musl where canonicalize_file_name is not implemented - -filesystem.cpp:46:15: error: 'canonicalize_file_name' was not declared in this scope - char *p = canonicalize_file_name(path); - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - lib/engine/filesystem.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/engine/filesystem.cpp b/lib/engine/filesystem.cpp -index b99257e..6064837 100644 ---- a/lib/engine/filesystem.cpp -+++ b/lib/engine/filesystem.cpp -@@ -43,7 +43,7 @@ void CanonicalPath::__canonicalize_path_name(const char *path) - if (path == 0) { - throw E_NULL_POINTER; - } -- char *p = canonicalize_file_name(path); -+ char *p = realpath(path, NULL); - assign(p); - if (p) { - free(p); --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch new file mode 100644 index 000000000..261358459 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch @@ -0,0 +1,47 @@ +From 24e0f55c07080a59907c190a315e279f7b2355e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 14:25:02 -0700 +Subject: [PATCH 3/4] engine: Define discover(const String &path) in base class + +this fixes the confusion that compiler may have when inheriting two +different classes where each of them defines discover() virtual function +but with different signatures + +Remove ununsed orom_vmd + +Signed-off-by: Khem Raj +--- + lib/engine/storage_object.h | 3 +++ + lib/engine/vmd_raid_info.h | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/engine/storage_object.h b/lib/engine/storage_object.h +index f1feb62..9c1d3d8 100644 +--- a/lib/engine/storage_object.h ++++ b/lib/engine/storage_object.h +@@ -123,6 +123,9 @@ public: + virtual void discover() { + throw E_INVALID_OPERATION; + } ++ virtual void discover(const String &path) { ++ throw E_INVALID_OPERATION; ++ } + virtual void addToSession(const boost::shared_ptr& pSession) = 0; + }; + +diff --git a/lib/engine/vmd_raid_info.h b/lib/engine/vmd_raid_info.h +index 2bea839..cc6ffbe 100644 +--- a/lib/engine/vmd_raid_info.h ++++ b/lib/engine/vmd_raid_info.h +@@ -53,8 +53,6 @@ public: + return SSI_ControllerTypeVMD; + } + +-private: +- struct orom_info orom_vmd; + }; + + #endif /* __VMD_RAID_INFO_H__INCLUDED__ */ +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch new file mode 100644 index 000000000..848d38b22 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch @@ -0,0 +1,43 @@ +From c817db76bb63b872fe2069e3c2449ac18affe8c1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 30 Aug 2019 13:17:38 -0700 +Subject: [PATCH] replace canonicalize_file_name with realpath + +Use 'realpath()' (BSD, POSIX) instead of +'canonicalize_file_name()' (GNU extension). + +Fixes +error: use of undeclared identifier 'canonicalize_file_name' + +Signed-off-by: Khem Raj +--- + lib/engine/filesystem.cpp | 2 +- + tools/ssieventmonitor.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/engine/filesystem.cpp b/lib/engine/filesystem.cpp +index bf5a776..194ab8a 100644 +--- a/lib/engine/filesystem.cpp ++++ b/lib/engine/filesystem.cpp +@@ -54,7 +54,7 @@ void CanonicalPath::__canonicalize_path_name(const char *path) + if (path == NULL) { + throw E_NULL_POINTER; + } +- char *p = canonicalize_file_name(path); ++ char *p = realpath(path, (char *)0); + assign(p); + if (p) { + free(p); +diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp +index 80791fd..3eed877 100644 +--- a/tools/ssieventmonitor.cpp ++++ b/tools/ssieventmonitor.cpp +@@ -120,7 +120,7 @@ static int _exec_ssimsg(void) + int status; + switch (pid) { + case 0: { +- cp = canonicalize_file_name("/proc/self/exe"); ++ cp = realpath("/proc/self/exe", (char *)0); + if (cp) { + strcpy_s(buffer, sizeof(buffer), cp); + free(cp); diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch new file mode 100644 index 000000000..ca2ffc56b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch @@ -0,0 +1,33 @@ +From 98fad8128d0f3b65619827ee5d65f7767b080c4c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 14:35:16 -0700 +Subject: [PATCH 4/4] Do not override flags coming from build environment + +e.g. we need some optimization level turned on when security flags are enabled +without this change, the build would fail + +Signed-off-by: Khem Raj +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 34e41ea..9bd0fe3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,9 +16,9 @@ AM_INIT_AUTOMAKE(ssi, ${VERSION}) + AM_CONFIG_HEADER(config.h) + + dnl Set the language we use +-CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" +-CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" +-CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" ++#CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -fvisibility=hidden -D_GNU_SOURCE -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" ++#CFLAGS="-std=gnu99 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" ++#CXXFLAGS="-std=gnu++98 -fvisibility-inlines-hidden -O3 -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fPIC" + + dnl Automake 1.11 - silent build rules + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch deleted file mode 100644 index 7dce0da40..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 04e8b99d8195a0e39982ecd27802421610633724 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Jun 2017 22:18:31 -0700 -Subject: [PATCH 4/6] engine: Fix indentation and missing semi-colon - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - lib/engine/mdadm_config.cpp | 5 +++-- - lib/engine/unique_id_manager.cpp | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lib/engine/mdadm_config.cpp b/lib/engine/mdadm_config.cpp -index 1914ddc..e40c2c7 100644 ---- a/lib/engine/mdadm_config.cpp -+++ b/lib/engine/mdadm_config.cpp -@@ -118,9 +118,10 @@ void check_configuration() - attr >> config; - configOk = correct_config(config); - } catch (Exception ex) { -- if (ex != E_NOT_FOUND) -+ if (ex != E_NOT_FOUND) { - dlog("Warning: mdadm config file cannot be read, new one will be written"); - backup = false; -+ } - } - - if (configOk && monitor_running()) { -@@ -134,7 +135,7 @@ void check_configuration() - dlog("Warning: failed to update mdadm.conf"); - } - if (restart_monitor() == 0) -- dlog("Monitor restarted successfully") -+ dlog("Monitor restarted successfully"); - else - dlog("Error starting Monitor"); - } -diff --git a/lib/engine/unique_id_manager.cpp b/lib/engine/unique_id_manager.cpp -index 99c153c..87d6ddc 100644 ---- a/lib/engine/unique_id_manager.cpp -+++ b/lib/engine/unique_id_manager.cpp -@@ -185,7 +185,7 @@ void UniqueIdManager::refresh() - keyFile >> keyList; - keyList += "\n"; - } catch (...) { -- dlog("ssi.keys file missing") -+ dlog("ssi.keys file missing"); - /* no file? that's ok */ - } - /* process the list to update IdCaches */ --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch new file mode 100644 index 000000000..d63eb5061 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch @@ -0,0 +1,25 @@ +From e90101128dfe75b9b1a0575a0179d211f677e6ad Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 30 Aug 2019 13:19:50 -0700 +Subject: [PATCH] include limits.h + +Fixes +error: use of undeclared identifier 'PATH_MAX' + +Signed-off-by: Khem Raj +--- + tools/ssieventmonitor.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp +index 3eed877..0d11975 100644 +--- a/tools/ssieventmonitor.cpp ++++ b/tools/ssieventmonitor.cpp +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch new file mode 100644 index 000000000..c516f6525 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch @@ -0,0 +1,228 @@ +From 3ec4eaf1688e413e8b5cb433148a3bc6e7987606 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 15:10:03 -0700 +Subject: [PATCH] enable out of source tree builds + +Signed-off-by: Khem Raj +--- + lib/efi/Makefile.am | 2 +- + lib/engine/Makefile.am | 2 +- + lib/orom/Makefile.am | 2 +- + lib/safeclib/Makefile.am | 2 +- + src/Makefile.am | 16 ++++++++-------- + tools/Makefile.am | 10 +++++----- + ut/Makefile.am | 36 ++++++++++++++++++------------------ + 7 files changed, 35 insertions(+), 35 deletions(-) + +--- a/lib/efi/Makefile.am ++++ b/lib/efi/Makefile.am +@@ -7,6 +7,6 @@ libefi_la_SOURCES = \ + efi.h + + libefi_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib +--- a/lib/engine/Makefile.am ++++ b/lib/engine/Makefile.am +@@ -123,6 +123,7 @@ libengine_la_SOURCES = \ + volume.h + + libengine_la_CPPFLAGS = \ ++ -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib +--- a/lib/orom/Makefile.am ++++ b/lib/orom/Makefile.am +@@ -7,6 +7,6 @@ liborom_la_SOURCES = \ + orom.h + + liborom_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib +--- a/lib/safeclib/Makefile.am ++++ b/lib/safeclib/Makefile.am +@@ -37,7 +37,7 @@ libsafec_la_SOURCES = \ + strtok_s.c + + libsafec_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib \ + -Wno-unused-variable +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = nostdinc + lib_LTLIBRARIES = libssi.la + + libssi_la_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib \ + -DBOOST_NO_USER_CONFIG +@@ -46,10 +46,10 @@ libssi_la_SOURCES = + templates.h \ + volume.cpp + +-libssi_la_LIBADD = \ +- ../lib/efi/libefi.la \ +- ../lib/log/liblog.la \ +- ../lib/orom/liborom.la \ +- ../lib/mpb/libmpb.la \ +- ../lib/engine/libengine.la \ +- ../lib/safeclib/libsafec.la ++libssi_la_LIBADD = \ ++ $(top_builddir)/lib/efi/libefi.la \ ++ $(top_builddir)/lib/log/liblog.la \ ++ $(top_builddir)/lib/orom/liborom.la \ ++ $(top_builddir)/lib/mpb/libmpb.la \ ++ $(top_builddir)/lib/engine/libengine.la \ ++ $(top_builddir)/lib/safeclib/libsafec.la +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -6,17 +6,18 @@ ssimsg_SOURCES = + ssimsg.cpp + + ssimsg_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib + +-ssieventmonitor_SOURCES = \ ++ssieventmonitor_SOURCES = \ + ssieventmonitor.cpp + +-ssieventmonitor_CPPFLAGS = \ ++ssieventmonitor_CPPFLAGS = \ ++ -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib + + ssieventmonitor_LDADD = \ +- $(top_srcdir)/lib/safeclib/libsafec.la ++ $(top_builddir)/lib/safeclib/libsafec.la +--- a/ut/Makefile.am ++++ b/ut/Makefile.am +@@ -8,81 +8,81 @@ ut_events_SOURCES = \ + ut_events.cpp + + ut_events_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_events_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_volume_SOURCES = \ + ut_volume.cpp + + ut_volume_CPPFLAGS = \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_volume_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_session_SOURCES = \ + ut_session.cpp + + ut_session_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_session_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_info_SOURCES = \ + ut_info.cpp + + ut_info_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_info_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_markasspare_SOURCES = \ + ut_markasspare.cpp + + ut_markasspare_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_markasspare_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_migration_SOURCES = \ + ut_migration.cpp + + ut_migration_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_migration_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_phy_SOURCES = \ + ut_phy.cpp + + ut_phy_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_phy_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_initialize_volume_SOURCES = \ + ut_initialize_volume.cpp + + ut_initialize_volume_CPPFLAGS = \ +- -g3 -I$(top_srcdir) \ ++ -g3 -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_initialize_volume_LDADD = \ +- ../src/libssi.la ++ $(top_builddir)/src/libssi.la + + ut_filesystem_SOURCES = \ + ut_filesystem.cpp \ +@@ -92,7 +92,7 @@ ut_filesystem_SOURCES = \ + + ut_filesystem_CPPFLAGS = \ + -iquote $(top_srcdir)/lib/engine \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + + ut_string_SOURCES = \ +@@ -103,6 +103,6 @@ ut_string_SOURCES = \ + + ut_string_CPPFLAGS = \ + -iquote $(top_srcdir)/lib/engine \ +- -I$(top_srcdir) \ ++ -I$(top_builddir) \ + -I$(top_srcdir)/include + diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch deleted file mode 100644 index 6f4dbf18e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a2e3a2e332c406ea3c56a8d74b61978107df68e6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Jun 2017 22:23:08 -0700 -Subject: [PATCH 5/6] engine: Define SENTINEL - -Fix warnings with gcc7 -test.cpp:12: warning: missing sentinel in function call - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - lib/engine/utils.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/engine/utils.cpp b/lib/engine/utils.cpp -index 44579a1..8812a8c 100644 ---- a/lib/engine/utils.cpp -+++ b/lib/engine/utils.cpp -@@ -35,7 +35,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - #include "filesystem.h" - #include "utils.h" - #include "log/log.h" -- -+#define SENTINEL (const char *)0 - /** - * @brief capture shell output as binary data - * -@@ -139,7 +139,7 @@ int shell(const String &s) - * Before switching into new executable close all non standard - * file handlers.*/ - close_parent_fds(); -- execl("/bin/sh", "sh", "-c", cmd.get(), NULL); -+ execl("/bin/sh", "sh", "-c", cmd.get(), SENTINEL); - /* If we're here then execl failed*/ - exit(-1); - break; --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch deleted file mode 100644 index a7b70e3f4..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From df1d56d6b6a6b15d0137619eb8a4b623de6c9633 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Jun 2017 22:28:59 -0700 -Subject: [PATCH 6/6] tools: Add missing includes and use realpath() instead of - canonicalize_file_name - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - tools/ssieventmonitor.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tools/ssieventmonitor.cpp b/tools/ssieventmonitor.cpp -index 0553386..f04b8f0 100644 ---- a/tools/ssieventmonitor.cpp -+++ b/tools/ssieventmonitor.cpp -@@ -18,7 +18,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - #include - #include - #include --#include -+#include -+#include -+#include - #include - #include - #include -@@ -99,7 +101,7 @@ static int _exec_ssimsg(void) - int status; - switch (pid) { - case 0: { -- cp = canonicalize_file_name("/proc/self/exe"); -+ cp = realpath("/proc/self/exe", NULL); - if (cp) { - strcpy(buffer, cp); - free(cp); --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch deleted file mode 100644 index d45be590c..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Do not override flags thereby respect the flags coming from environment, -e.g. we need some optimization level turned on when security flags are enabled -without this change, the build would fail - -Signed-off-by: Khem Raj -Index: ssiapi.1.0.1/configure.ac -=================================================================== ---- ssiapi.1.0.1.orig/configure.ac -+++ ssiapi.1.0.1/configure.ac -@@ -15,11 +15,6 @@ AC_SUBST(VERSION) - AM_INIT_AUTOMAKE(ssi, ${VERSION}) - AM_CONFIG_HEADER(config.h) - --dnl Set the language we use --CPPFLAGS="-g3 -gdwarf-2 -Wall -Werror -D_GNU_SOURCE" --CFLAGS="-std=gnu99" --CXXFLAGS="-std=gnu++98" -- - dnl Automake 1.11 - silent build rules - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb deleted file mode 100644 index 5eb4696b5..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Intel RSTe with Linux OS SSI API Library" - -DESCRIPTION = "Intel Rapid Storage Technology enterprise with Linux OS* Standard Storage Interface API Library. \ -The library allows user to manage storage devices including creating and managing Raid arrays on systems with Intel chipset." - -HOMEPAGE = "http://irstessi.sourceforge.net/" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=0413ff365e0bd733c4869a6797551c6f" - -DEPENDS += "sg3-utils" - -SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \ - file://0001-Use-pragma-once-unconditionally.patch \ - file://0002-Convert-macros-into-functions.patch \ - file://0003-Replace-canonicalize_file_name-with-realpath-API.patch \ - file://0004-engine-Fix-indentation-and-missing-semi-colon.patch \ - file://0005-engine-Define-SENTINEL.patch \ - file://0006-tools-Add-missing-includes-and-use-realpath-instead-.patch \ - file://configure-cflags.patch \ - file://0001-ssieventmonitor-ordered-comparison-between-pointers-.patch \ - " -SRC_URI[md5sum] = "02f16d7cbd30d28034093212906591f5" -SRC_URI[sha256sum] = "e10d283b0f211afb8ebd0bde87c097769613d30a052cdf164753e35e803264c7" - -S ="${WORKDIR}/${BPN}.${PV}" - -inherit autotools-brokensep -CXXFLAGS="-std=gnu++98 -D_GNU_SOURCE" - -do_configure_prepend(){ - ./autogen.sh -} - -RDEPENDS_${PN} += "mdadm" diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb new file mode 100644 index 000000000..eb086817e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Intel RSTe with Linux OS SSI API Library" + +DESCRIPTION = "Intel Rapid Storage Technology enterprise with Linux OS* Standard Storage Interface API Library. \ +The library allows user to manage storage devices including creating and managing Raid arrays on systems with Intel chipset." + +HOMEPAGE = "http://irstessi.sourceforge.net/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=9d701a2fbb56039fd64afb2262008ddb" + +DEPENDS += "sg3-utils" + +SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \ + file://0001-log-Avoid-shadowing-functions-from-std-lib.patch \ + file://0002-boost-Backport-clang-support.patch \ + file://0003-engine-Define-discover-const-String-path-in-base-cla.patch \ + file://0004-Do-not-override-flags-coming-from-build-environment.patch \ + file://0005-enable-out-of-source-tree-builds.patch \ + file://0001-Don-t-use-__GNUC_PREREQ.patch \ + file://0002-Use-stangard-int-types.patch \ + file://0003-replace-canonicalize_file_name-with-realpath.patch \ + file://0004-include-limits.h.patch \ + file://0001-Include-libgen.h.patch \ + " +SRC_URI[md5sum] = "d06c9b426437a7697d77266e9835b520" +SRC_URI[sha256sum] = "59daab29363d6e9f07c524029c4239653cfbbee6b0e57fd75df62499728dad8a" + +S ="${WORKDIR}/${BPN}.${PV}" + +inherit autotools + +do_configure_prepend(){ + ${S}/autogen.sh +} + +RDEPENDS_${PN} += "mdadm" diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Fix-issue-599.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Fix-issue-599.patch deleted file mode 100644 index 2a9ea74cd..000000000 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Fix-issue-599.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1dd07113f2a7489444a8990a95be42e035f8e9df Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx -Date: Tue, 1 Nov 2016 12:57:35 +0100 -Subject: [PATCH] Fix issue #599 -Forwarded: https://github.com/zaphoyd/websocketpp/pull/600 - ---- - websocketpp/transport/asio/security/tls.hpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index 7b32db8..a8aafec 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -355,13 +355,9 @@ protected: - template - lib::error_code translate_ec(ErrorCodeType ec) { - if (ec.category() == lib::asio::error::get_ssl_category()) { -- if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) { -- return make_error_code(transport::error::tls_short_read); -- } else { - // We know it is a TLS related error, but otherwise don't know - // more. Pass through as TLS generic. - return make_error_code(transport::error::tls_error); -- } - } else { - // We don't know any more information about this error so pass - // through --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Replace-make_shared-with-new-in-some-cases.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Replace-make_shared-with-new-in-some-cases.patch new file mode 100644 index 000000000..0c8285df9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Replace-make_shared-with-new-in-some-cases.patch @@ -0,0 +1,78 @@ +From 080fc37949114184d4832f7acffe2613745833f3 Mon Sep 17 00:00:00 2001 +From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> +Date: Tue, 16 Apr 2019 08:38:01 +0200 +Subject: [PATCH 1/2] Replace make_shared with new in some cases + +Replace make_shared for asio types that take a lib::ref as a parameter. +This should fix the ASIO change (boostorg/asio@59066d8) for 1.70, +while keeping it backwards compatible to older boost versions. +--- + websocketpp/transport/asio/connection.hpp | 7 ++++--- + websocketpp/transport/asio/endpoint.hpp | 3 +-- + websocketpp/transport/asio/security/none.hpp | 3 +-- + websocketpp/transport/asio/security/tls.hpp | 3 +-- + 4 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index 60f88a7..1ccda8f 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -311,9 +311,10 @@ public: + * needed. + */ + timer_ptr set_timer(long duration, timer_handler callback) { +- timer_ptr new_timer = lib::make_shared( +- lib::ref(*m_io_service), +- lib::asio::milliseconds(duration) ++ timer_ptr new_timer( ++ new lib::asio::steady_timer( ++ *m_io_service, ++ lib::asio::milliseconds(duration)) + ); + + if (config::enable_multithreading) { +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index ddab2c7..4b719a9 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -195,8 +195,7 @@ public: + + m_io_service = ptr; + m_external_io_service = true; +- m_acceptor = lib::make_shared( +- lib::ref(*m_io_service)); ++ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); + + m_state = READY; + ec = lib::error_code(); +diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp +index 5c8293d..6c7d352 100644 +--- a/websocketpp/transport/asio/security/none.hpp ++++ b/websocketpp/transport/asio/security/none.hpp +@@ -168,8 +168,7 @@ protected: + return socket::make_error_code(socket::error::invalid_state); + } + +- m_socket = lib::make_shared( +- lib::ref(*service)); ++ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, *m_socket); +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index c76fd9a..04ac379 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -193,8 +193,7 @@ protected: + if (!m_context) { + return socket::make_error_code(socket::error::invalid_tls_context); + } +- m_socket = lib::make_shared( +- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); ++ m_socket.reset(new socket_type(*service, *m_context)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, get_socket()); +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch new file mode 100644 index 000000000..962d08967 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch @@ -0,0 +1,66 @@ +From 12ab603ca962e83591985a585451d33544d75d56 Mon Sep 17 00:00:00 2001 +From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> +Date: Wed, 17 Apr 2019 10:06:18 +0000 +Subject: [PATCH 2/2] Fix missed entries; fix testing + +--- + CMakeLists.txt | 2 +- + websocketpp/transport/asio/connection.hpp | 3 +-- + websocketpp/transport/asio/endpoint.hpp | 7 ++----- + 3 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba..951de97 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + endif () + + if (NOT Boost_USE_STATIC_LIBS) +- add_definitions (/DBOOST_TEST_DYN_LINK) ++ add_definitions (-DBOOST_TEST_DYN_LINK) + endif () + + set (Boost_FIND_REQUIRED TRUE) +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index 1ccda8f..57dda74 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -462,8 +462,7 @@ protected: + m_io_service = io_service; + + if (config::enable_multithreading) { +- m_strand = lib::make_shared( +- lib::ref(*io_service)); ++ m_strand.reset(new lib::asio::io_service::strand(*io_service)); + } + + lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 4b719a9..94509ad 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -687,9 +687,7 @@ public: + * @since 0.3.0 + */ + void start_perpetual() { +- m_work = lib::make_shared( +- lib::ref(*m_io_service) +- ); ++ m_work.reset(new lib::asio::io_service::work(*m_io_service)); + } + + /// Clears the endpoint's perpetual flag, allowing it to exit when empty +@@ -853,8 +851,7 @@ protected: + + // Create a resolver + if (!m_resolver) { +- m_resolver = lib::make_shared( +- lib::ref(*m_io_service)); ++ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); + } + + tcon->set_uri(u); +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch deleted file mode 100644 index 530c960ce..000000000 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4 Mon Sep 17 00:00:00 2001 -From: Peter Thorson -Date: Sun, 11 Jun 2017 16:13:25 -0500 -Subject: [PATCH] minor adjustments to recent extension negotiation related - fixes, refactor a bit more extension negotiation code to be simpler - ---- - websocketpp/impl/connection_impl.hpp | 6 +-- - websocketpp/processors/hybi13.hpp | 92 ++++++++++++++++++------------------ - 2 files changed, 49 insertions(+), 49 deletions(-) - -Index: websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp -=================================================================== ---- websocketpp-0.7.0.orig/websocketpp/impl/connection_impl.hpp -+++ websocketpp-0.7.0/websocketpp/impl/connection_impl.hpp -@@ -1222,17 +1222,17 @@ - std::pair neg_results; - neg_results = m_processor->negotiate_extensions(m_request); - -- if (neg_results.first == error::make_error_code(error::extension_parse_error)) { -+ if (neg_results.first == processor::error::make_error_code(processor::error::extension_parse_error)) { - // There was a fatal error in extension parsing that should result in - // a failed connection attempt. -- m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message()); -+ m_elog.write(log::elevel::info, "Bad request: " + neg_results.first.message()); - m_response.set_status(http::status_code::bad_request); - return neg_results.first; - } else if (neg_results.first) { - // There was a fatal error in extension processing that is probably our - // fault. Consider extension negotiation to have failed and continue as - // if extensions were not supported -- m_alog.write(log::alevel::info, -+ m_elog.write(log::elevel::info, - "Extension negotiation failed: " + neg_results.first.message()); - } else { - // extension negotiation succeeded, set response header accordingly -Index: websocketpp-0.7.0/websocketpp/processors/hybi13.hpp -=================================================================== ---- websocketpp-0.7.0.orig/websocketpp/processors/hybi13.hpp -+++ websocketpp-0.7.0/websocketpp/processors/hybi13.hpp -@@ -97,11 +97,6 @@ - /** - * This exists mostly because the code for requests and responses is - * identical and I can't have virtual template methods. -- * -- * NOTE: this method makes assumptions that the permessage-deflate -- * extension is the only one supported. If additional extensions are -- * ever supported it should be reviewed carefully. Most cases where -- * that assumption is made are explicitly noted. - */ - template - err_str_pair negotiate_extensions_helper(header_type const & header) { -@@ -130,55 +125,60 @@ - - http::parameter_list::const_iterator it; - -+ // look through the list of extension requests to find the first -+ // one that we can accept. - if (m_permessage_deflate.is_implemented()) { - err_str_pair neg_ret; - for (it = p.begin(); it != p.end(); ++it) { -- // look through each extension, if the key is permessage-deflate -- if (it->first == "permessage-deflate") { -- // if we have already successfully negotiated this extension -- // then skip any other requests to negotiate the same one -- // with different parameters -- if (m_permessage_deflate.is_enabled()) { -- continue; -- } -- -- -- neg_ret = m_permessage_deflate.negotiate(it->second); -- -- if (neg_ret.first) { -- // Figure out if this is an error that should halt all -- // extension negotiations or simply cause negotiation of -- // this specific extension to fail. -- //std::cout << "permessage-compress negotiation failed: " -- // << neg_ret.first.message() << std::endl; -- } else { -- // Note: this list will need commas if WebSocket++ ever -- // supports more than one extension -- -- // Actually try to initialize the extension before we -- // deem negotiation complete -- ret.first = m_permessage_deflate.init(base::m_server); -- if (!ret.first) { -- -- // TODO: support multiple extensions. -- // right now, because there is only one extension -- // supported, it failing to negotiate means we are -- // done with all negotiating. In the future if more -- // extensions are supported a better solution will -- // be needed here. -- break; -- } else { -- ret.second += neg_ret.second; -- -- // continue looking for more extensions -- continue; -- } -- -- } -+ // not a permessage-deflate extension request, ignore -+ if (it->first != "permessage-deflate") { -+ continue; -+ } -+ -+ // if we have already successfully negotiated this extension -+ // then skip any other requests to negotiate the same one -+ // with different parameters -+ if (m_permessage_deflate.is_enabled()) { -+ continue; -+ } -+ -+ // attempt to negotiate this offer -+ neg_ret = m_permessage_deflate.negotiate(it->second); -+ -+ if (neg_ret.first) { -+ // negotiation offer failed. Do nothing. We will continue -+ // searching for a permessage-deflate config that succeeds -+ continue; -+ } -+ -+ // Negotiation tentatively succeeded -+ -+ // Actually try to initialize the extension before we -+ // deem negotiation complete -+ lib::error_code ec = m_permessage_deflate.init(base::m_server); -+ -+ if (ec) { -+ // Negotiation succeeded but initialization failed this is -+ // an error that should stop negotiation of permessage -+ // deflate. Return the reason for the init failure -+ -+ ret.first = ec; -+ break; -+ } else { -+ // Successfully initialized, push the negotiated response into -+ // the reply and stop looking for additional permessage-deflate -+ // extensions -+ ret.second += neg_ret.second; -+ break; - } - } - } - -+ // support for future extensions would go here. Should check the value of -+ // ret.first before continuing. Might need to consider whether failure of -+ // negotiation of an earlier extension should stop negotiation of subsequent -+ // ones -+ - return ret; - } - diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch deleted file mode 100644 index 94bfeb2fd..000000000 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch +++ /dev/null @@ -1,600 +0,0 @@ -## Description: add some description -## Origin/Author: add some origin or author -## Bug: bug URL -From 9ddb300d874a30db35e3ad58f188944bef0bf31b Mon Sep 17 00:00:00 2001 -From: Peter Thorson -Date: Sun, 11 Jun 2017 15:24:43 -0500 -Subject: [PATCH] Update permessage-deflate support to reflect that zlib - doesn't support a 256 bit window. Improve extension negotiation error - checking and documentation. fixes #596 fixes #653 - ---- - changelog.md | 8 ++ - test/extension/permessage_deflate.cpp | 153 +++++++++++++++++---- - .../extensions/permessage_deflate/enabled.hpp | 94 ++++++++++--- - websocketpp/impl/connection_impl.hpp | 10 +- - websocketpp/processors/hybi13.hpp | 28 +++- - 5 files changed, 247 insertions(+), 46 deletions(-) - -diff --git a/changelog.md b/changelog.md -index bba753cb..de98edd2 100644 -#--- a/changelog.md -#+++ b/changelog.md -#@@ -17,6 +17,14 @@ HEAD -# - Compatibility: Update `telemetry_client` to use a slightly more cross platform -# method of sleeping. Should work on windows now. Thank you Meir Yanovich for -# reporting. -#+- Compatibility: Updated permessage-deflate support to reflect that the zlib -#+ library does not actually support a sliding window size of 256 bits. -#+ WebSocket++ will no longer negotiate 256 bit deflate windows. If the user -#+ of the library tries to request a 256 bit window a 512 bit window will be -#+ specified instead (This was the previous behavior). #596 #653 Thank you -#+ Vinnie Falco and Gianfranco Costamagna for reporting. -#+- Compatibility: Better error handling and logging in cases where extension -#+ requests parse correctly but negotiation fails. -# - Bug: Store loggers in shared pointers to avoid crashes related to connections -# trying to write logs entries after their respective endpoint has been -# deallocated. Thank you Thalhammer for reporting and Jupp Müller for the -diff --git a/test/extension/permessage_deflate.cpp b/test/extension/permessage_deflate.cpp -index 4cd3e7b6..805afcc3 100644 ---- a/test/extension/permessage_deflate.cpp -+++ b/test/extension/permessage_deflate.cpp -@@ -186,15 +186,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) { - - BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) { - ext_vars v; -+ -+ // confirm that a request for a value of 8 is interpreted as 9 - v.attr["server_max_window_bits"] = "8"; -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); - -+ v.attr["server_max_window_bits"] = "9"; - v.esp = v.exts.negotiate(v.attr); - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); - -- v.attr["server_max_window_bits"] = "15"; - -+ v.attr["server_max_window_bits"] = "15"; - v.esp = v.exts.negotiate(v.attr); - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -@@ -213,7 +220,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_server_max_window_bits ) { - - BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) { - ext_vars v; -- v.attr["server_max_window_bits"] = "8"; -+ v.attr["server_max_window_bits"] = "9"; - - v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::decline); - v.esp = v.exts.negotiate(v.attr); -@@ -223,7 +230,7 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) { - BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); - } - --BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { -+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept_8 ) { - ext_vars v; - v.attr["server_max_window_bits"] = "8"; - -@@ -232,10 +239,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); - } - --BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { -+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) { -+ ext_vars v; -+ v.attr["server_max_window_bits"] = "9"; -+ -+ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::accept); -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); -+} -+ -+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest_8 ) { - ext_vars v; - v.attr["server_max_window_bits"] = "8"; - -@@ -244,10 +263,22 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); - } - --BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { -+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) { -+ ext_vars v; -+ v.attr["server_max_window_bits"] = "9"; -+ -+ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::largest); -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); -+} -+ -+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest_8 ) { - ext_vars v; - v.attr["server_max_window_bits"] = "8"; - -@@ -256,7 +287,19 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); -+} -+ -+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) { -+ ext_vars v; -+ v.attr["server_max_window_bits"] = "9"; -+ -+ v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::smallest); -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9"); - } - - // Negotiate server_max_window_bits -@@ -292,7 +335,13 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_valid ) { - v.esp = v.exts.negotiate(v.attr); - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); -+ -+ v.attr["client_max_window_bits"] = "9"; -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); - - v.attr["client_max_window_bits"] = "15"; - v.esp = v.exts.negotiate(v.attr); -@@ -311,7 +360,7 @@ BOOST_AUTO_TEST_CASE( invalid_set_client_max_window_bits ) { - BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits)); - } - --BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline_8 ) { - ext_vars v; - v.attr["client_max_window_bits"] = "8"; - -@@ -323,7 +372,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { - BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); - } - --BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) { -+ ext_vars v; -+ v.attr["client_max_window_bits"] = "9"; -+ -+ v.ec = v.exts.set_client_max_window_bits(9,pmd_mode::decline); -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate"); -+} -+ -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept_8 ) { - ext_vars v; - v.attr["client_max_window_bits"] = "8"; - -@@ -332,10 +393,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); - } - --BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) { -+ ext_vars v; -+ v.attr["client_max_window_bits"] = "9"; -+ -+ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::accept); -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); -+} -+ -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest_8 ) { - ext_vars v; - v.attr["client_max_window_bits"] = "8"; - -@@ -344,10 +417,22 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); - } - --BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) { -+ ext_vars v; -+ v.attr["client_max_window_bits"] = "9"; -+ -+ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::largest); -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); -+} -+ -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest_8 ) { - ext_vars v; - v.attr["client_max_window_bits"] = "8"; - -@@ -356,7 +441,19 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { - BOOST_CHECK( v.exts.is_enabled() ); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -- BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8"); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); -+} -+ -+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) { -+ ext_vars v; -+ v.attr["client_max_window_bits"] = "9"; -+ -+ v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::smallest); -+ v.esp = v.exts.negotiate(v.attr); -+ BOOST_CHECK( v.exts.is_enabled() ); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() ); -+ BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9"); - } - - -@@ -507,7 +604,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) { - std::string compress_out; - std::string decompress_out; - -- v.exts.init(true); -+ v.ec = v.exts.init(true); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - - v.ec = v.exts.compress(compress_in,compress_out); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -@@ -520,7 +618,8 @@ BOOST_AUTO_TEST_CASE( compress_data ) { - BOOST_AUTO_TEST_CASE( compress_data_multiple ) { - ext_vars v; - -- v.exts.init(true); -+ v.ec = v.exts.init(true); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - - for (int i = 0; i < 2; i++) { - std::string compress_in = "Hello"; -@@ -545,11 +644,12 @@ BOOST_AUTO_TEST_CASE( compress_data_large ) { - - websocketpp::http::attribute_list alist; - -- alist["server_max_window_bits"] = "8"; -- v.exts.set_server_max_window_bits(8,websocketpp::extensions::permessage_deflate::mode::smallest); -+ alist["server_max_window_bits"] = "9"; -+ v.exts.set_server_max_window_bits(9,websocketpp::extensions::permessage_deflate::mode::smallest); - - v.exts.negotiate(alist); -- v.exts.init(true); -+ v.ec = v.exts.init(true); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - - v.ec = v.exts.compress(compress_in,compress_out); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -@@ -573,7 +673,8 @@ BOOST_AUTO_TEST_CASE( compress_data_no_context_takeover ) { - v.exts.enable_server_no_context_takeover(); - - v.exts.negotiate(alist); -- v.exts.init(true); -+ v.ec = v.exts.init(true); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - - v.ec = v.exts.compress(compress_in,compress_out1); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -@@ -609,7 +710,8 @@ BOOST_AUTO_TEST_CASE( compress_empty ) { - std::string compress_out; - std::string decompress_out; - -- v.exts.init(true); -+ v.ec = v.exts.init(true); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - - v.ec = v.exts.compress(compress_in,compress_out); - BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); -@@ -640,7 +742,8 @@ BOOST_AUTO_TEST_CASE( decompress_data ) { - std::string out; - std::string reference = "Hello"; - -- v.exts.init(true); -+ v.ec = v.exts.init(true); -+ BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() ); - - v.ec = v.exts.decompress(in,11,out); - -diff --git a/websocketpp/extensions/permessage_deflate/enabled.hpp b/websocketpp/extensions/permessage_deflate/enabled.hpp -index 1581f14c..f20a1b1d 100644 ---- a/websocketpp/extensions/permessage_deflate/enabled.hpp -+++ b/websocketpp/extensions/permessage_deflate/enabled.hpp -@@ -46,7 +46,7 @@ - namespace websocketpp { - namespace extensions { - --/// Implementation of the draft permessage-deflate WebSocket extension -+/// Implementation of RFC 7692, the permessage-deflate WebSocket extension - /** - * ### permessage-deflate interface - * -@@ -174,18 +174,30 @@ namespace websocketpp { - namespace extensions { - namespace permessage_deflate { - --/// Default value for server_max_window_bits as defined by draft 17 -+/// Default value for server_max_window_bits as defined by RFC 7692 - static uint8_t const default_server_max_window_bits = 15; --/// Minimum value for server_max_window_bits as defined by draft 17 -+/// Minimum value for server_max_window_bits as defined by RFC 7692 -+/** -+ * NOTE: A value of 8 is not actually supported by zlib, the deflate -+ * library that WebSocket++ uses. To preserve backwards compatibility -+ * with RFC 7692 and previous versions of the library a value of 8 -+ * is accepted by the library but will always be negotiated as 9. -+ */ - static uint8_t const min_server_max_window_bits = 8; --/// Maximum value for server_max_window_bits as defined by draft 17 -+/// Maximum value for server_max_window_bits as defined by RFC 7692 - static uint8_t const max_server_max_window_bits = 15; - --/// Default value for client_max_window_bits as defined by draft 17 -+/// Default value for client_max_window_bits as defined by RFC 7692 - static uint8_t const default_client_max_window_bits = 15; --/// Minimum value for client_max_window_bits as defined by draft 17 -+/// Minimum value for client_max_window_bits as defined by RFC 7692 -+/** -+ * NOTE: A value of 8 is not actually supported by zlib, the deflate -+ * library that WebSocket++ uses. To preserve backwards compatibility -+ * with RFC 7692 and previous versions of the library a value of 8 -+ * is accepted by the library but will always be negotiated as 9. -+ */ - static uint8_t const min_client_max_window_bits = 8; --/// Maximum value for client_max_window_bits as defined by draft 17 -+/// Maximum value for client_max_window_bits as defined by RFC 7692 - static uint8_t const max_client_max_window_bits = 15; - - namespace mode { -@@ -372,7 +384,7 @@ class enabled { - /** - * The bits setting is the base 2 logarithm of the maximum window size that - * the server must use to compress outgoing messages. The permitted range -- * is 8 to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB -+ * is 9 to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB - * window. The default setting is 15. - * - * Mode Options: -@@ -386,6 +398,14 @@ class enabled { - * adjusted by the server. A server may unilaterally set this value without - * client support. - * -+ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed. -+ * Prior to version 0.8.0 a value of 8 was also allowed by this library. -+ * zlib, the deflate compression library that WebSocket++ uses has always -+ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 -+ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0 -+ * continues to perform the 8->9 conversion for backwards compatibility -+ * purposes but this should be considered deprecated functionality. -+ * - * @param bits The size to request for the outgoing window size - * @param mode The mode to use for negotiating this parameter - * @return A status code -@@ -394,6 +414,12 @@ class enabled { - if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) { - return error::make_error_code(error::invalid_max_window_bits); - } -+ -+ // See note in doc comment above about what is happening here -+ if (bits == 8) { -+ bits = 9; -+ } -+ - m_server_max_window_bits = bits; - m_server_max_window_bits_mode = mode; - -@@ -403,8 +429,8 @@ class enabled { - /// Limit client LZ77 sliding window size - /** - * The bits setting is the base 2 logarithm of the window size that the -- * client must use to compress outgoing messages. The permitted range is 8 -- * to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB window. -+ * client must use to compress outgoing messages. The permitted range is 9 -+ * to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB window. - * The default setting is 15. - * - * Mode Options: -@@ -417,6 +443,14 @@ class enabled { - * outgoing window size unilaterally. A server may only limit the client's - * window size if the remote client supports that feature. - * -+ * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed. -+ * Prior to version 0.8.0 a value of 8 was also allowed by this library. -+ * zlib, the deflate compression library that WebSocket++ uses has always -+ * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 -+ * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0 -+ * continues to perform the 8->9 conversion for backwards compatibility -+ * purposes but this should be considered deprecated functionality. -+ * - * @param bits The size to request for the outgoing window size - * @param mode The mode to use for negotiating this parameter - * @return A status code -@@ -425,6 +459,12 @@ class enabled { - if (bits < min_client_max_window_bits || bits > max_client_max_window_bits) { - return error::make_error_code(error::invalid_max_window_bits); - } -+ -+ // See note in doc comment above about what is happening here -+ if (bits == 8) { -+ bits = 9; -+ } -+ - m_client_max_window_bits = bits; - m_client_max_window_bits_mode = mode; - -@@ -642,11 +682,17 @@ class enabled { - * client requested that we use. - * - * options: -- * - decline (refuse to use the attribute) -- * - accept (use whatever the client says) -- * - largest (use largest possible value) -+ * - decline (ignore value, offer our default instead) -+ * - accept (use the value requested by the client) -+ * - largest (use largest value acceptable to both) - * - smallest (use smallest possible value) - * -+ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might -+ * be requested for negotiation by an older client/server, if the result of -+ * the negotiation would be to send a value of 8, a value of 9 is offered -+ * instead. This ensures that WebSocket++ will only ever negotiate connections -+ * with compression settings explicitly supported by zlib. -+ * - * @param [in] value The value of the attribute from the offer - * @param [out] ec A reference to the error code to return errors via - */ -@@ -678,6 +724,11 @@ class enabled { - ec = make_error_code(error::invalid_mode); - m_server_max_window_bits = default_server_max_window_bits; - } -+ -+ // See note in doc comment -+ if (m_server_max_window_bits == 8) { -+ m_server_max_window_bits = 9; -+ } - } - - /// Negotiate client_max_window_bits attribute -@@ -687,11 +738,17 @@ class enabled { - * negotiation mode. - * - * options: -- * - decline (refuse to use the attribute) -- * - accept (use whatever the client says) -- * - largest (use largest possible value) -+ * - decline (ignore value, offer our default instead) -+ * - accept (use the value requested by the client) -+ * - largest (use largest value acceptable to both) - * - smallest (use smallest possible value) - * -+ * NOTE: As a value of 8 is no longer explicitly supported by zlib but might -+ * be requested for negotiation by an older client/server, if the result of -+ * the negotiation would be to send a value of 8, a value of 9 is offered -+ * instead. This ensures that WebSocket++ will only ever negotiate connections -+ * with compression settings explicitly supported by zlib. -+ * - * @param [in] value The value of the attribute from the offer - * @param [out] ec A reference to the error code to return errors via - */ -@@ -727,6 +784,11 @@ class enabled { - ec = make_error_code(error::invalid_mode); - m_client_max_window_bits = default_client_max_window_bits; - } -+ -+ // See note in doc comment -+ if (m_client_max_window_bits == 8) { -+ m_client_max_window_bits = 9; -+ } - } - - bool m_enabled; -diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp -index 105911db..ae55c338 100644 ---- a/websocketpp/impl/connection_impl.hpp -+++ b/websocketpp/impl/connection_impl.hpp -@@ -1222,12 +1222,18 @@ lib::error_code connection::process_handshake_request() { - std::pair neg_results; - neg_results = m_processor->negotiate_extensions(m_request); - -- if (neg_results.first) { -+ if (neg_results.first == error::make_error_code(error::extension_parse_error)) { - // There was a fatal error in extension parsing that should result in - // a failed connection attempt. -- m_alog.write(log::alevel::devel, "Bad request: " + neg_results.first.message()); -+ m_alog.write(log::alevel::info, "Bad request: " + neg_results.first.message()); - m_response.set_status(http::status_code::bad_request); - return neg_results.first; -+ } else if (neg_results.first) { -+ // There was a fatal error in extension processing that is probably our -+ // fault. Consider extension negotiation to have failed and continue as -+ // if extensions were not supported -+ m_alog.write(log::alevel::info, -+ "Extension negotiation failed: " + neg_results.first.message()); - } else { - // extension negotiation succeeded, set response header accordingly - // we don't send an empty extensions header because it breaks many -diff --git a/websocketpp/processors/hybi13.hpp b/websocketpp/processors/hybi13.hpp -index 79486654..a95bc649 100644 ---- a/websocketpp/processors/hybi13.hpp -+++ b/websocketpp/processors/hybi13.hpp -@@ -97,6 +97,11 @@ class hybi13 : public processor { - /** - * This exists mostly because the code for requests and responses is - * identical and I can't have virtual template methods. -+ * -+ * NOTE: this method makes assumptions that the permessage-deflate -+ * extension is the only one supported. If additional extensions are -+ * ever supported it should be reviewed carefully. Most cases where -+ * that assumption is made are explicitly noted. - */ - template - err_str_pair negotiate_extensions_helper(header_type const & header) { -@@ -149,9 +154,26 @@ class hybi13 : public processor { - } else { - // Note: this list will need commas if WebSocket++ ever - // supports more than one extension -- ret.second += neg_ret.second; -- m_permessage_deflate.init(base::m_server); -- continue; -+ -+ // Actually try to initialize the extension before we -+ // deem negotiation complete -+ ret.first = m_permessage_deflate.init(base::m_server); -+ if (!ret.first) { -+ -+ // TODO: support multiple extensions. -+ // right now, because there is only one extension -+ // supported, it failing to negotiate means we are -+ // done with all negotiating. In the future if more -+ // extensions are supported a better solution will -+ // be needed here. -+ break; -+ } else { -+ ret.second += neg_ret.second; -+ -+ // continue looking for more extensions -+ continue; -+ } -+ - } - } - } diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/disable-tests.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/disable-tests.patch deleted file mode 100644 index 342981d4d..000000000 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/disable-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Disable failing test_transport_asio_timers. -Because of "address already in use" error -/«PKGBUILDDIR»/test/transport/asio/timers.cpp(129): error in "tls_handshake_timeout": check ec == make_error_code(tls_handshake_timeout) failed [websocketpp.transport.asio.socket:8 != websocketpp.transport.asio.socket:5] -Author: Gianfranco Costamagna - ---- websocketpp-0.7.0.orig/test/transport/CMakeLists.txt -+++ websocketpp-0.7.0/test/transport/CMakeLists.txt -@@ -1,24 +1,24 @@ - if (OPENSSL_FOUND) - --# Test transport integration --file (GLOB SOURCE integration.cpp) -- --init_target (test_transport) --build_test (${TARGET_NAME} ${SOURCE}) --link_boost () --link_openssl() --final_target () --set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") -- --# Test transport asio timers --file (GLOB SOURCE asio/timers.cpp) -- --init_target (test_transport_asio_timers) --build_test (${TARGET_NAME} ${SOURCE}) --link_boost () --link_openssl() --final_target () --set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") -+## Test transport integration -+#file (GLOB SOURCE integration.cpp) -+# -+#init_target (test_transport) -+#build_test (${TARGET_NAME} ${SOURCE}) -+#link_boost () -+#link_openssl() -+#final_target () -+#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") -+# -+## Test transport asio timers -+#file (GLOB SOURCE asio/timers.cpp) -+# -+#init_target (test_transport_asio_timers) -+#build_test (${TARGET_NAME} ${SOURCE}) -+#link_boost () -+#link_openssl() -+#final_target () -+#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test") - - # Test transport asio security - file (GLOB SOURCE asio/security.cpp) diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb index 75a5f886a..551621708 100644 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb @@ -5,7 +5,10 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" DEPENDS = "openssl boost zlib" -SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master" +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ + file://0001-Replace-make_shared-with-new-in-some-cases.patch \ + file://0002-Fix-missed-entries-fix-testing.patch \ + " # tag 0.8.1 SRCREV= "c6d7e295bf5a0ab9b5f896720cc1a0e0fdc397a7" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch new file mode 100644 index 000000000..1cec47fca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch @@ -0,0 +1,67 @@ +From c1c980a95d85bcaf8802524d6148783522b300d7 Mon Sep 17 00:00:00 2001 +From: Yulong Pei +Date: Wed, 21 Jul 2010 22:33:43 +0800 +Subject: [PATCH] change finding path of nss and nspr + +Upstream-Status: Pending + +Signed-off-by: Yulong Pei +Signed-off-by: Mingli Yu +Signed-off-by: Yi Zhao +--- + configure.ac | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 951b3eb..1fdeb0f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -866,10 +866,10 @@ MOZILLA_MIN_VERSION="1.4" + NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" + NSPR_PACKAGE=mozilla-nspr + NSS_PACKAGE=mozilla-nss +-NSPR_INCLUDE_MARKER="nspr/nspr.h" ++NSPR_INCLUDE_MARKER="nspr.h" + NSPR_LIB_MARKER="libnspr4$shrext" + NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" +-NSS_INCLUDE_MARKER="nss/nss.h" ++NSS_INCLUDE_MARKER="nss3/nss.h" + NSS_LIB_MARKER="libnss3$shrext" + NSS_LIBS_LIST="-lnss3 -lsmime3" + +@@ -898,24 +898,24 @@ fi + dnl Priority 1: User specifies the path to installation + if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then + AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) +- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then +- NSPR_INCLUDE_PATH="$with_nspr/include" +- NSPR_LIB_PATH="$with_nspr/lib" ++ if test -f "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then ++ NSPR_INCLUDE_PATH="$with_nspr/usr/include" ++ NSPR_LIB_PATH="$with_nspr/${libdir}" + NSPR_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) + fi + fi + if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then + AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) +- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then +- NSS_INCLUDE_PATH="$with_nss/include" +- NSS_LIB_PATH="$with_nss/lib" ++ if test -f "$with_nss/usr/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then ++ NSS_INCLUDE_PATH="$with_nss/usr/include/nss3" ++ NSS_LIB_PATH="$with_nss/${libdir}" + NSS_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nss/usr/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) + fi + fi + +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch new file mode 100644 index 000000000..af598fe74 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch @@ -0,0 +1,26 @@ +From 847dc52f5a50e34ee4d6e3dc2c708711747a58ca Mon Sep 17 00:00:00 2001 +From: Yulong Pei +Date: Thu, 21 Jan 2010 14:11:20 +0800 +Subject: [PATCH] force to use our own libtool + +Upstream-Status: Inappropriate [ OE specific ] + +Signed-off-by: Yulong Pei + +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 147d758..a61f16b 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -6969,7 +6969,7 @@ func_mode_link () + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =* | [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch new file mode 100644 index 000000000..d45356924 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch @@ -0,0 +1,40 @@ +From 83a1381e1d6bd1b5ec3df6f7c4bc1f4fe4f860b6 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 15 Jun 2017 14:44:01 +0800 +Subject: [PATCH] xmlsec1: add new recipe + +This enables the building of the examples directory +and it's installed as ptest. + +Upstream-Status: Inappropriate [ OE ptest specific ] + +Signed-off-by: Jackie Huang + +--- + examples/Makefile | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index 89b1d61..c1cbcca 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -8,9 +8,17 @@ PROGRAMS = \ + decrypt1 decrypt2 decrypt3 \ + xmldsigverify + ++ifndef CC + CC = gcc +-CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS +-LDLIBS += -g $(shell xmlsec1-config --libs) ++endif ++ ++CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS ++LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) ++ ++DESTDIR = /usr/share/xmlsec1 ++install-ptest: ++ if [ ! -d $(DESTDIR) ]; then mkdir -p $(DESTDIR); fi ++ cp * $(DESTDIR) + + all: $(PROGRAMS) + diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest new file mode 100755 index 000000000..a203c38f2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest @@ -0,0 +1,85 @@ +#!/bin/sh + +check_return() { + if [ $? == 0 ]; then + echo -e "PASS: $1\n" + else + echo -e "FAIL: $1\n" + fi +} + +echo "---------------------------------------------------" +echo "Signing a template file..." +./sign1 sign1-tmpl.xml rsakey.pem > sign1-res.xml +./verify1 sign1-res.xml rsapub.pem +check_return sign-tmpl + +echo "---------------------------------------------------" +echo "Signing a dynamicaly created template..." +./sign2 sign2-doc.xml rsakey.pem > sign2-res.xml +./verify1 sign2-res.xml rsapub.pem +check_return sign-dynamic-templ + +echo "---------------------------------------------------" +echo "Signing with X509 certificate..." +./sign3 sign3-doc.xml rsakey.pem rsacert.pem > sign3-res.xml +./verify3 sign3-res.xml ca2cert.pem cacert.pem +check_return sign-x509 + +echo "---------------------------------------------------" +echo "Verifying a signature with a single key..." +./verify1 sign1-res.xml rsapub.pem +./verify1 sign2-res.xml rsapub.pem +check_return verify-single-key + +echo "---------------------------------------------------" +echo "Verifying a signature with keys manager..." +./verify2 sign1-res.xml rsapub.pem +./verify2 sign2-res.xml rsapub.pem +check_return verify-keys-manager + +echo "---------------------------------------------------" +echo "Verifying a signature with X509 certificates..." +./verify3 sign3-res.xml ca2cert.pem cacert.pem +check_return verify-x509 + +echo "---------------------------------------------------" +echo "Verifying a signature with additional restrictions..." +./verify4 verify4-res.xml ca2cert.pem cacert.pem +check_return verify-res + +echo "---------------------------------------------------" +echo "Encrypting data with a template file..." +./encrypt1 encrypt1-tmpl.xml deskey.bin > encrypt1-res.xml +./decrypt1 encrypt1-res.xml deskey.bin +check_return encrypt-tmpl + +echo "---------------------------------------------------" +echo "Encrypting data with a dynamicaly created template..." +./encrypt2 encrypt2-doc.xml deskey.bin > encrypt2-res.xml +./decrypt1 encrypt2-res.xml deskey.bin +check_return encrypt-dynamic-tmpl + +echo "---------------------------------------------------" +echo "Encrypting data with a session key..." +./encrypt3 encrypt3-doc.xml rsakey.pem > encrypt3-res.xml +./decrypt3 encrypt3-res.xml +check_return encrypt-session-key + +echo "---------------------------------------------------" +echo "Decrypting data with a single key..." +./decrypt1 encrypt1-res.xml deskey.bin +./decrypt1 encrypt2-res.xml deskey.bin +check_return encrypt-single-key + +echo "---------------------------------------------------" +echo "Decrypting data with keys manager..." +./decrypt2 encrypt1-res.xml deskey.bin +./decrypt2 encrypt2-res.xml deskey.bin +check_return encrypt-keys-manager + +echo "---------------------------------------------------" +echo "Writing a custom keys manager..." +./decrypt3 encrypt1-res.xml +./decrypt3 encrypt2-res.xml +check_return write-keys-manager diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch new file mode 100644 index 000000000..8b2533ed9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch @@ -0,0 +1,30 @@ +From 0c38c6864e7ba8f53a657d87894f24374a6a4932 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Tue, 30 Dec 2014 11:18:17 +0800 +Subject: [PATCH] examples: allow build in separate dir + +Upstream-Status: Inappropriate [ OE specific ] + +Signed-off-by: Jackie Huang + +--- + examples/Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index c1cbcca..3f1bd14 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -12,8 +12,10 @@ ifndef CC + CC = gcc + endif + +-CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS +-LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) ++top_srcdir = .. ++top_builddir = .. ++CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS ++LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 ) + + DESTDIR = /usr/share/xmlsec1 + install-ptest: diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb new file mode 100644 index 000000000..0a4c56aa0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb @@ -0,0 +1,64 @@ +SUMMARY = "XML Security Library is a C library based on LibXML2" +DESCRIPTION = "\ + XML Security Library is a C library based on \ + LibXML2 and OpenSSL. The library was created with a goal to support major \ + XML security standards "XML Digital Signature" and "XML Encryption". \ + " +HOMEPAGE = "http://www.aleksey.com/xmlsec/" +DEPENDS = "libtool libxml2 libxslt zlib" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0" + +SECTION = "libs" + +SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ + file://fix-ltmain.sh.patch \ + file://change-finding-path-of-nss.patch \ + file://makefile-ptest.patch \ + file://xmlsec1-examples-allow-build-in-separate-dir.patch \ + file://run-ptest \ + " + +SRC_URI[md5sum] = "69b8d95c009a404462e19f335e650241" +SRC_URI[sha256sum] = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4" + +inherit autotools-brokensep ptest pkgconfig + +CFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3" +CPPFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3" + +PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[libgcrypt] = ",,libgcrypt" +PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/../.. --with-nspr=${STAGING_LIBDIR}/../..,,nss nspr" +PACKAGECONFIG[openssl] = ",,openssl" +PACKAGECONFIG[des] = ",--disable-des,," + +# these can be dynamically loaded with xmlSecCryptoDLLoadLibrary() +FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so" +FILES_${PN} += "${libdir}/libxmlsec1-*.so" +INSANE_SKIP_${PN} = "dev-so" + +FILES_${PN}-dev += "${libdir}/xmlsec1Conf.sh" +FILES_${PN}-dbg += "${PTEST_PATH}/.debug/*" + +RDEPENDS_${PN}-ptest += "${PN}-dev" +INSANE_SKIP_${PN}-ptest += "dev-deps" + +PTEST_EXTRA_ARGS = "top_srcdir=${S} top_builddir=${B}" + +do_compile_ptest () { + oe_runmake -C ${S}/examples ${PTEST_EXTRA_ARGS} all +} + +do_install_append() { + for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \ + ${libdir}/pkgconfig/xmlsec1-openssl.pc; do + sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i + done +} + +do_install_ptest () { + oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest +} diff --git a/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb b/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb index 09290909d..7e9971ea4 100644 --- a/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb @@ -65,4 +65,4 @@ do_install () { RDEPENDS_${PN} +="bash" # http://errors.yoctoproject.org/Errors/Details/186956/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb b/meta-openembedded/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb new file mode 100644 index 000000000..dd8e1159e --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb @@ -0,0 +1,21 @@ +SUMMARY = "Perl module that imports environment variables as scalars or arrays" +DESCRIPTION = "Perl maintains environment variables in a special hash named %ENV. \ +For when this access method is inconvenient, the Perl module Env allows environment \ +variables to be treated as scalar or array variables." + +HOMEPAGE = "http://search.cpan.org/~flora/Env/" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=76c1cbf18db56b3340d91cb947943bd3" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Env-${PV}.tar.gz" + +SRC_URI[md5sum] = "fdba5c0690e66972c96fee112cf5f25c" +SRC_URI[sha256sum] = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0" + +S = "${WORKDIR}/Env-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc index bf3485ccb..7d11045ad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc @@ -2,8 +2,8 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=28aaf14a6592d14dbfb2f4abd597aa27" -SRC_URI[md5sum] = "b8603f4c9bac851570bd1798e8f23982" -SRC_URI[sha256sum] = "cdb7d98bd5cbf65acd38d70b1c05573c432e6473a82f955cdea541b5c153b0cc" +SRC_URI[md5sum] = "69fb6b25923d4f1e3c392447b342e358" +SRC_URI[sha256sum] = "4a4811119efbdc5259d1f4c8f6de977b36ad3bcc919f59a29c2960c5ef9149e4" PYPI_PACKAGE = "alembic" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.0.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.0.11.bb deleted file mode 100644 index efcb2b1de..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.0.11.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb new file mode 100644 index 000000000..efcb2b1de --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb new file mode 100644 index 000000000..94db37a2d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb @@ -0,0 +1,25 @@ +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "http://packages.python.org/cmd2/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc" + +SRC_URI[md5sum] = "df35bb2dca8f5e1f6090e1f0aa02960a" +SRC_URI[sha256sum] = "4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d" + +inherit pypi setuptools + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-pyparsing \ + ${PYTHON_PN}-pyperclip \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-textutils \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb deleted file mode 100644 index 1b75e347b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "http://packages.python.org/cmd2/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=60bc6842001870a418935bd84570b676" - -SRC_URI[md5sum] = "bfe0900a2288283a40f0ee7533486a2f" -SRC_URI[sha256sum] = "e7b6b4b76272a051c943c3c709cd760142af16fbc9218e0ed3c22b28ea38d0a8" - -inherit pypi setuptools - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-pyparsing \ - ${PYTHON_PN}-pyperclip \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-subprocess \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-textutils \ - " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb index ffb5beb57..002da046c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb @@ -8,8 +8,8 @@ RDEPENDS_${PN} = "python-docutils \ python-resource \ " -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +LICENSE = "Apache-2.0 & GPLv3" +LIC_FILES_CHKSUM = "file://README;md5=2695c853a2cafc33e68a1d972889ebd2" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc index 91cc62f40..1a15c48de 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc @@ -5,8 +5,8 @@ SECTION = "devel/python" DEPENDS_append = "${PYTHON_PN}-grpcio" RDEPENDS_${PN} = "${PYTHON_PN}-grpcio" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio.inc index 7d3675c45..c5762b26b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio.inc @@ -17,8 +17,8 @@ RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-six \ " -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi 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 1ecca3524..a915e09f9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Interval arithmetic for Python" HOMEPAGE = "https://github.com/AlexandreDecan/python-intervals" SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" PYPI_PACKAGE := "python-intervals" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc index 6fdc02498..8f5bdaa58 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc @@ -2,10 +2,10 @@ SUMMARY = "An implementation of JSON Schema validation for Python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" -SRC_URI[md5sum] = "50c6b69a373a8b55ff1e0ec6e78f13f4" -SRC_URI[sha256sum] = "6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02" +SRC_URI[md5sum] = "2b44d00dccc96d7ba3839190263152eb" +SRC_URI[sha256sum] = "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d" -DEPENDS += "${PYTHON_PN}-vcversioner-native" +DEPENDS += "${PYTHON_PN}-vcversioner-native ${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += " \ ${PYTHON_PN}-core \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb deleted file mode 100644 index b677c646e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -inherit pypi setuptools -require python-jsonschema.inc - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-argparse \ - ${PYTHON_PN}-contextlib \ - ${PYTHON_PN}-functools32 \ - ${PYTHON_PN}-lang \ - ${PYTHON_PN}-re \ - ${PYTHON_PN}-subprocess \ - ${PYTHON_PN}-textutils \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb new file mode 100644 index 000000000..b677c646e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb @@ -0,0 +1,12 @@ +inherit pypi setuptools +require python-jsonschema.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-contextlib \ + ${PYTHON_PN}-functools32 \ + ${PYTHON_PN}-lang \ + ${PYTHON_PN}-re \ + ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-textutils \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb index 9ad865d40..20ea01804 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" RDEPENDS_${PN} = "python-threading" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.0.bb deleted file mode 100644 index 6873b7dbe..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Tools for using a Web Server Gateway Interface stack" -HOMEPAGE = "http://pythonpaste.org/" -LICENSE = "MIT" -RDEPENDS_${PN} = "python-six" - -LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c" - -SRC_URI[md5sum] = "904ec5634f3f901cadf529711930a98b" -SRC_URI[sha256sum] = "18323f22df5ab6998fdf4c5aa5a9f41d33ff949a87ad7b2ca48e72fbf50fa3e4" - -PYPI_PACKAGE = "Paste" -inherit pypi setuptools - -FILES_${PN} += "/usr/lib/*" - -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb new file mode 100644 index 000000000..90e7970a5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "Tools for using a Web Server Gateway Interface stack" +HOMEPAGE = "http://pythonpaste.org/" +LICENSE = "MIT" +RDEPENDS_${PN} = "python-six" + +LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c" + +SRC_URI[md5sum] = "07132313bc62c7525402d31119161228" +SRC_URI[sha256sum] = "baca402a089594db0cf1e9aae5c98bcf91588bbbaf848527257e246b960eb72f" + +PYPI_PACKAGE = "Paste" +inherit pypi setuptools + +FILES_${PN} += "/usr/lib/*" + +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + 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 53f778393..2bc8e4ab6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/AlexandreDecan/python-intervals" SECTION = "devel/python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b" PYPI_PACKAGE := "Pint" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.2.bb deleted file mode 100644 index 9a037274d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "PIP is a tool for installing and managing Python packages" -HOMEPAGE = "https://pip.pypa.io/" -LICENSE = "MIT & LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" - -SRC_URI[md5sum] = "2ba0a3b76d39ccd90ca22bfa82fc635f" -SRC_URI[sha256sum] = "e05103825871e210d50a44c7e448587b0ed99dd775d3ef586304c58f40224a53" - -inherit pypi setuptools - -# Since PIP is like CPAN for PERL we need to drag in all python modules to ensure everything works -RDEPENDS_${PN}_class-target = "python-modules python-distribute python-misc" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb new file mode 100644 index 000000000..506a9e21c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "PIP is a tool for installing and managing Python packages" +HOMEPAGE = "https://pip.pypa.io/" +LICENSE = "MIT & LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" + +SRC_URI[md5sum] = "f417444c66a0db1a82c8d9d2283a2f95" +SRC_URI[sha256sum] = "e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135" + +inherit pypi setuptools + +# Since PIP is like CPAN for PERL we need to drag in all python modules to ensure everything works +RDEPENDS_${PN}_class-target = "python-modules python-distribute python-misc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc index 320359aa6..c9bee6287 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc @@ -1,9 +1,11 @@ SUMMARY = "Plugin and hook calling mechanisms for python" HOMEPAGE = "https://github.com/pytest-dev/pluggy" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=338dad807ed9337bfaeb9979c3bfe20f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" -SRC_URI[md5sum] = "ffdde7c3a5ba9a440404570366ffb6d5" -SRC_URI[sha256sum] = "7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff" +SRC_URI[md5sum] = "e986647f5d786c0cc1bd065cf9bac658" +SRC_URI[sha256sum] = "0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb new file mode 100644 index 000000000..edcd4f512 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.12.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pluggy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb deleted file mode 100644 index edcd4f512..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-pluggy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc index ce95e66c9..5058d4bd3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://developers.google.com/protocol-buffers/" SECTION = "devel/python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de84f8d949cfcfd4e" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index 4c32dfb04..49ef790f0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -1,13 +1,13 @@ SUMMARY = "Simple powerful teting with python" HOMEPAGE = "http://pytest.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c39b24965f4aef64222cb35de9d47cc4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "1b83a25d45fad893f430fc5031653c56" -SRC_URI[sha256sum] = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5" +SRC_URI[md5sum] = "662313b4f539f5b66d2fb77791458e82" +SRC_URI[sha256sum] = "c3d5020755f70c82eceda3feaf556af9a341334414a8eca521a18f463bcead88" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ - file://pytest_version_fix.patch " + " inherit update-alternatives diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch index 06dfcdfc6..c29fb12de 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch @@ -1,7 +1,7 @@ -From 24a901fd17926e8e05be4ed2e01b0113a2e3a852 Mon Sep 17 00:00:00 2001 -From: Derek Straka -Date: Tue, 19 Dec 2017 11:36:39 -0500 -Subject: [PATCH] [PATCH 1/1] setup.py: remove the setup_requires for +From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001 +From: Yuan Chao +Date: Wed, 28 Aug 2019 16:12:27 +0900 +Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for setuptools-scm The setup_requires argument forces the download of the egg file for setuptools-scm @@ -12,21 +12,25 @@ file and in the release tarball it is already correctly created Upstream-Status: Inappropriate [oe specific] Signed-off-by: Derek Straka + +Signed-off-by: Yuan Chao --- - setup.py | 1 - - 1 file changed, 1 deletion(-) + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 3eb38ef..1163202 100644 +index adbafb5..75fdd09 100644 --- a/setup.py +++ b/setup.py -@@ -82,7 +82,6 @@ def main(): - keywords="test unittest", - cmdclass={'test': PyTest}, - # the following should be enabled for release -- setup_requires=['setuptools-scm'], - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', - install_requires=install_requires, - extras_require=extras_require, +@@ -19,7 +19,7 @@ INSTALL_REQUIRES = [ + def main(): + setup( + use_scm_version={"write_to": "src/_pytest/_version.py"}, +- setup_requires=["setuptools-scm", "setuptools>=40.0"], ++ setup_requires=["setuptools>=40.0"], + package_dir={"": "src"}, + extras_require={ + "testing": [ -- -2.7.4 +2.17.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch deleted file mode 100644 index b373d93e8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream-Status: Inappropriate (OE specific) - -python-pytest: remove fetch during do_compile phase -commit: c974fbf9ebf185552ab65301e07af44f36517abf - -introduced an issue by making the version 0.0.0 -this fixes that - -Signed-off-by: Armin Kuster - -Index: pytest-3.2.2/setup.py -=================================================================== ---- pytest-3.2.2.orig/setup.py -+++ pytest-3.2.2/setup.py -@@ -1,5 +1,6 @@ - import os - import sys -+import re - import setuptools - import pkg_resources - from setuptools import setup, Command -@@ -22,6 +23,18 @@ classifiers = [ - with open('README.rst') as fd: - long_description = fd.read() - -+def read(*names, **kwargs): -+ with open(os.path.join( *names), 'r') as fp: -+ return fp.read() -+ -+def find_version(*file_paths): -+ version_file = read(*file_paths) -+ version_match = re.search(r"^version = ['\']([^'\"]*)['\']", -+ version_file, re.M) -+ -+ if version_match: -+ return version_match.group(1) -+ raise RuntimeError("Unable to find version string.") - - def get_environment_marker_support_level(): - """ -@@ -59,9 +72,7 @@ def main(): - name='pytest', - description='pytest: simple powerful testing with Python', - long_description=long_description, -- use_scm_version={ -- 'write_to': '_pytest/_version.py', -- }, -+ version=find_version("_pytest", "_version.py"), - url='http://pytest.org', - license='MIT license', - platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb deleted file mode 100644 index 39e50aca9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit pypi setuptools -require python-pytest.inc - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-argparse \ - ${PYTHON_PN}-compiler \ - ${PYTHON_PN}-funcsigs \ -" -ALTERNATIVE_PRIORITY = "10" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb new file mode 100644 index 000000000..39e50aca9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb @@ -0,0 +1,9 @@ +inherit pypi setuptools +require python-pytest.inc + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-compiler \ + ${PYTHON_PN}-funcsigs \ +" +ALTERNATIVE_PRIORITY = "10" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc index afce543f1..e9ae85eb0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc @@ -2,14 +2,14 @@ SUMMARY = "Python support for YAML" HOMEPAGE = "http://www.pyyaml.org" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5591701d32590f9fa94f3bfee820b634" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a76b4c69bfcf82313bbdc0393b04438a" DEPENDS = "libyaml ${PYTHON_PN}-cython-native ${PYTHON_PN}" PYPI_PACKAGE = "PyYAML" inherit pypi -SRC_URI[md5sum] = "b78b96636d68ac581c0e2f38158c224f" -SRC_URI[sha256sum] = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf" +SRC_URI[md5sum] = "20f87ab421b0271dbf371dc5c1cddb5c" +SRC_URI[sha256sum] = "01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4" RDEPENDS_${PN} += "\ ${PYTHON_PN}-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.13.bb deleted file mode 100644 index 5a4c92d88..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.13.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pyyaml.inc -inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_5.1.2.bb new file mode 100644 index 000000000..5a4c92d88 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_5.1.2.bb @@ -0,0 +1,2 @@ +require python-pyyaml.inc +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework-seriallibrary.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework-seriallibrary.inc index 9f07b6577..bfcb023a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework-seriallibrary.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework-seriallibrary.inc @@ -1,7 +1,7 @@ SUMMARY = "Robot Framework test library for serial connection" HOMEPAGE = "https://github.com/whosaysni/robotframework-seriallibrary" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" SRC_URI[md5sum] = "b7c9565d54c30df7cd3f3c0e29adffa3" SRC_URI[sha256sum] = "256ad60fc0b7df4be44d82c302f5ed8fad4935cda99e4b45942e3c88179d1e19" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc index 783d05b7e..aff86a594 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Bindings for the scrypt key derivation function library" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378" +LIC_FILES_CHKSUM = "file://LICENSE;md5=168ff75417f75a83e63c8875292d44dc" HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/overview" FILESEXTRAPATHS_prepend := "${THISDIR}/python-scrypt:" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc index 005aaadef..d70104dc2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc @@ -5,10 +5,10 @@ HOMEPAGE = "http://www.twistedmatrix.com" #twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL. LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d136e8cf7b52f2e64079186ae2060d8a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1743f12d8b8f5aec625c0569a058f0a6" -SRC_URI[sha256sum] = "fa2c04c2d68a9be7fc3975ba4947f653a57a656776f24be58ff0fe4b9aaf3e52" -SRC_URI[md5sum] = "528b7856938edc2a752c244aebd94981" +SRC_URI[sha256sum] = "d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d" +SRC_URI[md5sum] = "5e9296a952430d288cdcdc6ad9eb5ee8" PYPI_PACKAGE = "Twisted" PYPI_PACKAGE_EXT = "tar.bz2" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.1.bb deleted file mode 100644 index 5903db3e0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -inherit pypi setuptools -require python-twisted.inc - -RDEPENDS_${PN}-core += "${PYTHON_PN}-contextlib" - -RDEPENDS_${PN} += " \ - ${PN}-news \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.7.0.bb new file mode 100644 index 000000000..5903db3e0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_19.7.0.bb @@ -0,0 +1,8 @@ +inherit pypi setuptools +require python-twisted.inc + +RDEPENDS_${PN}-core += "${PYTHON_PN}-contextlib" + +RDEPENDS_${PN} += " \ + ${PN}-news \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc index b392b7521..ab8ee81ec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/python/typing" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" -SRC_URI[md5sum] = "8a3e4b822bac02b9b33c97e7d4f1521c" -SRC_URI[sha256sum] = "53765ec4f83a2b720214727e319607879fec4acde22c4fbb54fa2604e79e44ce" +SRC_URI[md5sum] = "0a1ebd4af65b4769e33459004eb20345" +SRC_URI[sha256sum] = "91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.1.bb new file mode 100644 index 000000000..04ce063c9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.1.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-typing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.bb deleted file mode 100644 index 04ce063c9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.7.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-typing.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc index 9df4520f7..6b4448220 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc @@ -1,7 +1,7 @@ SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." SECTION = "devel/python" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2c6db5887cc6b2fac8b701d64cb8442" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" -SRC_URI[md5sum] = "a4289aa01839f3ea1fb98929d9131001" -SRC_URI[sha256sum] = "fe21f23a9d05428c75461790b670f2bf15f50a632d6c171a7e7b588269c619e6" +SRC_URI[md5sum] = "2e6c0bd69a540e15ff2222d6cb8da466" +SRC_URI[sha256sum] = "6b5af8c37ff12745ae77f28e695c0d3a3327932fd229824e49382377e940fdf1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.0.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.0.11.bb deleted file mode 100644 index e248fe7ce..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.0.11.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb new file mode 100644 index 000000000..e248fe7ce --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb deleted file mode 100644 index 926990747..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-jsonschema.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb new file mode 100644 index 000000000..926990747 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-jsonschema.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb new file mode 100644 index 000000000..941e8e3d8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.12.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pluggy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb deleted file mode 100644 index 941e8e3d8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pluggy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb new file mode 100644 index 000000000..6d80c1091 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "Python bindings for DBus AT-SPI2 accessibility" +DESCRIPTION = "AT-SPI2 is a protocol over DBus, toolkit widgets use to provide content to screen readers such as Orca" +SECTION = "devel/python" +HOMEPAGE = "https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886 \ + file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "python3-dbus-native glib-2.0 dbus-glib libxml2 atk gtk+ python3-pygobject" + +SRC_URI = "git://github.com/GNOME/pyatspi2.git;protocol=https;branch=gnome-3-32" +SRCREV = "dc4565208fca00da06b972915a080ad3c63f640d" +S = "${WORKDIR}/git" + +inherit pkgconfig autotools python3native + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyatspi/*" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb new file mode 100644 index 000000000..89d718de6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.6.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Python bindings for interacting with systemd over DBus" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[md5sum] = "c5472be419f53f53f5da089ca8c981c0" +SRC_URI[sha256sum] = "b1fc072c87e3766711f64caf86fd633dca393e20c8a0a37a5058dd70a21d8a14" + +DEPENDS = "systemd" +REQUIRED_DISTRO_FEATURES = "systemd" + +inherit pypi setuptools3 distro_features_check + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb deleted file mode 100644 index eba6632a2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools3 -require python-pytest.inc - -ALTERNATIVE_PRIORITY = "100" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb new file mode 100644 index 000000000..eba6632a2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools3 +require python-pytest.inc + +ALTERNATIVE_PRIORITY = "100" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.13.bb deleted file mode 100644 index 470aca608..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.13.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pyyaml.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.1.2.bb new file mode 100644 index 000000000..470aca608 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_5.1.2.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pyyaml.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.1.bb deleted file mode 100644 index dfb9d4a4c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.2.1.bb +++ /dev/null @@ -1,65 +0,0 @@ -inherit pypi setuptools3 -require python-twisted.inc - -FILES_${PN}-core_append += " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ -" - -FILES_${PN}-names_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ -" - -FILES_${PN}-news_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ -" - -FILES_${PN}-protocols_append += " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ -" - -FILES_${PN}-conch_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ -" - -FILES_${PN}-lore_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ -" -FILES_${PN}-mail_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ -" - -FILES_${PN}-web_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ -" - -FILES_${PN}-words_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ -" - -FILES_${PN}-flow_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ -" - -FILES_${PN}-pair_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ -" - -FILES_${PN}-runner_append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.7.0.bb new file mode 100644 index 000000000..dfb9d4a4c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.7.0.bb @@ -0,0 +1,65 @@ +inherit pypi setuptools3 +require python-twisted.inc + +FILES_${PN}-core_append += " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ +" + +FILES_${PN}-names_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ +" + +FILES_${PN}-news_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ +" + +FILES_${PN}-protocols_append += " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ +" + +FILES_${PN}-conch_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ +" + +FILES_${PN}-lore_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ +" +FILES_${PN}-mail_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ +" + +FILES_${PN}-web_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ +" + +FILES_${PN}-words_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ +" + +FILES_${PN}-flow_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ +" + +FILES_${PN}-pair_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ +" + +FILES_${PN}-runner_append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.3.0.bb deleted file mode 100644 index 76bc41a11..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.3.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xxhash.inc -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb new file mode 100644 index 000000000..76bc41a11 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb @@ -0,0 +1,2 @@ +require python-xxhash.inc +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file mode 100644 index 000000000..9cccb892f --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch @@ -0,0 +1,28 @@ +It fails to compile xfce4-datetime-setter occasionally when system load is high: + +| ../git/xfce/main.c:42:10: fatal error: cc-datetime-resources.h: No such file or directory +| 42 | #include "cc-datetime-resources.h" +| | ^~~~~~~~~~~~~~~~~~~~~~~~~ +| compilation terminated. + +Update datetime_panel_dep to make sure cc-datetime-resources.h be generated +before including. + +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/2] + +Signed-off-by: Kai Kang +--- +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index c5bf39c..241e177 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -175,7 +175,8 @@ datetime_panel_lib = static_library( + + datetime_panel_dep = declare_dependency( + include_directories: [ common_inc, include_directories('.') ], +- link_with: datetime_panel_lib ++ link_with: datetime_panel_lib, ++ sources: resources + ) + + subdir('po-timezones') diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb index d64358537..4d128ac51 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -6,13 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" DEPENDS = "glib-2.0-native libxfce4ui" -SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https" +SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https \ + file://fix-inner-dependency.patch \ +" SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" S = "${WORKDIR}/git" inherit gettext meson distro_features_check -REQUIRED_DISTRO_FEATURES = "systemd" + +REQUIRED_DISTRO_FEATURES = "systemd x11" FILES_${PN} += "${datadir}/icons/hicolor" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb index 19a6e2b04..c30c79907 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb @@ -1,6 +1,4 @@ SUMMARY = "All packages multimedia packages available for XFCE" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit packagegroup diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index 140de416b..daee73eb3 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -1,7 +1,5 @@ SUMMARY = "All packages required for a base installation of XFCE" SECTION = "x11/wm" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" PR = "r5" inherit packagegroup distro_features_check diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index a22a2e07c..527f81f1f 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -1,7 +1,5 @@ SUMMARY = "All packages for full XFCE installation" SECTION = "x11/wm" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" PR = "r10" -- cgit v1.2.3 From a891d150c6a7455ddbb797bdc472f45fd5f36008 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 06:17:45 -0400 Subject: meta-openembedded: subtree update:ce51958eca..a2928764c2 Adrian Bunk (3): python3-cmd2: Remove PNBLACKLIST php: Remove no longer needed CFLAGS_append_aarch64 php: Move more into php.inc after php5 removal Alistair Francis (4): python3-requests-future: Initial commit of 0.9.5 python3-xmlrunner: Initial commit of 1.7.7 python3-fasteners: Initial commit of 0.15 python3-python-vlc: Initial commit of 3.0.7110 Anuj Mittal (3): python3-defusedxml: add recipe python-networkx: upgrade 2.1 -> 2.2 python3-networkx: add recipe Khem Raj (9): php: Turn PCRE JIT off for riscv redis: Fix build with clang/x86 android-tools: Recognise i686 for HOST_ARCH netdata: Update to 1.17.0 and fix build with clang/x86 safec: Define _GNU_SOURCE safec: Upgrade to 3.5 release openocd: Add --disable-werror always breakpad: Update dont-clobber-rsp patch to latest gparted: add to deps instead of overwriting Martin Jansa (3): remmina: add distro_features_check for GTK3DISTROFEATURES ceres-solver: fix the paths in .cmake files ceres-solver: add PACKAGECONFIG for suitesparse and lapack Naveen Saini (1): pm-graph: upgrade 5.3 -> 5.5 Oleksandr Kravchuk (1): analyze-suspend: update to 5.5 Peter Kjellerstedt (1): lvm2/libdevmapper: Make it build for native Randy MacLeod (1): poppler: update from 0.79.0 to 0.80.0 Slater, Joseph (1): openhpi: control snmp-bc ptest generation Stefan Agner (1): fuse3: add libfuse3 recipe Trevor Gamblin (1): gvfs: upgrade 1.40.2 -> 1.41.2 for CVE fixes Yi Zhao (2): php: fix module path in mod_php.conf apache-websocket: fix module path Yuan Chao (2): python-atomicwrites: new recipe python-pytest: fix runtime error Zang Ruochen (1): python-certifi: upgrade 2019.6.16 -> 2019.9.11 Change-Id: Iba065b25686a1ac22d647226d9ea0c61c5b4578f Signed-off-by: Brad Bishop --- .../recipes-support/fuse/fuse3_3.6.2.bb | 48 +++++++++++++ .../recipes-extended/gparted/gparted_0.33.0.bb | 2 +- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb | 82 ---------------------- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb | 82 ++++++++++++++++++++++ .../recipes-daemons/openhpi/openhpi_3.8.0.bb | 15 ++++ .../analyze-suspend/analyze-suspend_5.3.bb | 29 -------- .../analyze-suspend/analyze-suspend_5.5.bb | 29 ++++++++ ...emrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch | 30 ++++++++ .../meta-oe/recipes-core/safec/safec_3.4.bb | 15 ---- .../meta-oe/recipes-core/safec/safec_3.5.bb | 19 +++++ .../android-tools/android-tools_5.1.1.r37.bb | 2 +- .../breakpad/breakpad/dont-clobber-rsp.patch | 46 ++++++++++++ .../recipes-devtools/openocd/openocd_git.bb | 4 +- .../meta-oe/recipes-devtools/php/php.inc | 16 +++-- .../recipes-devtools/php/php/php-fpm-apache.conf | 4 +- .../meta-oe/recipes-devtools/php/php_7.3.9.bb | 8 --- .../redis/0001-src-Do-not-reset-FINAL_LIBS.patch | 32 +++++++++ .../meta-oe/recipes-extended/redis/redis_4.0.14.bb | 5 +- .../pm-graph/pm-graph/0001-bootgraph.py.patch | 32 --------- .../pm-graph/0001-sleepgraph.py-use-python3.patch | 39 ++++++++++ .../recipes-kernel/pm-graph/pm-graph_5.3.bb | 22 ------ .../recipes-kernel/pm-graph/pm-graph_5.5.bb | 22 ++++++ .../ceres-solver/ceres-solver_1.14.bb | 15 ++++ ...configure-Fix-setting-of-CLDFLAGS-default.patch | 78 ++++++++++++++++++++ .../meta-oe/recipes-support/lvm2/lvm2.inc | 1 + .../recipes-support/poppler/poppler_0.79.0.bb | 50 ------------- .../recipes-support/poppler/poppler_0.80.0.bb | 50 +++++++++++++ .../recipes-support/remmina/remmina_1.3.6.bb | 5 +- .../python/python-atomicwrites.inc | 7 ++ .../python/python-atomicwrites_1.3.0.bb | 2 + .../recipes-devtools/python/python-certifi.inc | 4 +- .../python/python-certifi_2019.6.16.bb | 2 - .../python/python-certifi_2019.9.11.bb | 2 + .../recipes-devtools/python/python-networkx.inc | 10 +++ .../recipes-devtools/python/python-networkx_2.1.bb | 12 ---- .../recipes-devtools/python/python-networkx_2.2.bb | 8 +++ .../recipes-devtools/python/python-pytest.inc | 1 + .../python/python3-atomicwrites_1.3.0.bb | 2 + .../python/python3-certifi_2019.6.16.bb | 2 - .../python/python3-certifi_2019.9.11.bb | 2 + .../recipes-devtools/python/python3-cmd2_0.9.16.bb | 1 - .../python/python3-defusedxml_0.6.0.bb | 11 +++ .../python/python3-fasteners_0.15.bb | 9 +++ .../python/python3-networkx_2.3.bb | 8 +++ .../python/python3-python-vlc_3.0.7110.bb | 9 +++ .../python/python3-requests-futures_0.9.5.bb | 14 ++++ .../python/python3-xmlrunner_1.7.7.bb | 9 +++ .../apache-mod/apache-websocket_git.bb | 8 +-- .../recipes-webadmin/netdata/netdata_git.bb | 7 +- 49 files changed, 634 insertions(+), 278 deletions(-) create mode 100644 meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch create mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb new file mode 100644 index 000000000..e65eb08e2 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb @@ -0,0 +1,48 @@ +SUMMARY = "Implementation of a fully functional filesystem in a userspace program" +DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ + programs to export a virtual filesystem to the Linux kernel. FUSE \ + also aims to provide a secure method for non privileged users to \ + create and mount their own filesystem implementations. \ + " +HOMEPAGE = "https://github.com/libfuse/libfuse" +SECTION = "libs" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" + +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ +" +SRC_URI[md5sum] = "1798945aa69434286723b9999a141c7a" +SRC_URI[sha256sum] = "f45869427575e1e59ab743a67deb57addbf2cb8f9ce431199dbd40ddab71f281" + +S = "${WORKDIR}/fuse-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P3(\.\d+)+).tar.xz" + +inherit meson pkgconfig + +DEPENDS = "udev" + +PACKAGES =+ "fuse3-utils" + +RPROVIDES_${PN}-dbg += "fuse3-utils-dbg" + +RRECOMMENDS_${PN}_class-target = "kernel-module-fuse fuse3-utils" + +FILES_${PN} += "${libdir}/libfuse3.so.*" +FILES_${PN}-dev += "${libdir}/libfuse3*.la" + +EXTRA_OEMESON += " \ + -Dexamples=false \ +" + +# Forbid auto-renaming to libfuse3-utils +FILES_fuse3-utils = "${bindir} ${base_sbindir}" +DEBIAN_NOAUTONAME_fuse3-utils = "1" +DEBIAN_NOAUTONAME_${PN}-dbg = "1" + +do_install_append() { + rm -rf ${D}${base_prefix}/dev +} diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb index a9f6993fb..de143b9c8 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb @@ -15,7 +15,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "2f481ad34decb7021ca04ca305e79e7d" SRC_URI[sha256sum] = "5023b8c983f88a22e65bf6f09a12ea09369defc008981b52ee8b96a3879f81d6" -DEPENDS = "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" +DEPENDS += "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" do_install_append() { # Add a script which checks if polkit is installed. diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb deleted file mode 100644 index 4fca1076f..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb +++ /dev/null @@ -1,82 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase bash-completion gettext upstream-version-is-even - -DEPENDS += "libsecret glib-2.0 glib-2.0-native gconf libgudev shadow-native" - -SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" - -SRC_URI[archive.md5sum] = "47db9bec616e089513b7f1386e5c7d5f" -SRC_URI[archive.sha256sum] = "bdefe8fec6a1097f0c126fa2a4533667c98a86e237ac640518000e16b363971e" - - -EXTRA_OEMESON = " \ - -Dbluray=false \ - -Dgoa=false \ - -Dgoogle=false \ - -Dnfs=false \ -" - -PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" - -FILES_${PN} += " \ - ${datadir}/glib-2.0 \ - ${datadir}/GConf \ - ${datadir}/dbus-1/services \ - ${libdir}/gio/modules/*.so \ - ${libdir}/tmpfiles.d \ - ${systemd_user_unitdir} \ -" - -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" -FILES_${PN}-dev += "${libdir}/gio/modules/*.la" - -FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" -FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" -FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" - -RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" - -PACKAGECONFIG ?= "libgphoto2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ - " - -PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" -PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" -PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" -PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" -PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" -PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" -PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" -PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" -PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" -PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" -PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" - -# needs meta-filesystems -PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" - -# libcdio-paranoia recipe doesn't exist yet -PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d - fi - - # After rebuilds (not from scracth) it can happen that the executables in - # libexec ar missing executable permission flag. Not sure but it came up - # during transition to meson. Looked into build files and logs but could - # not find suspicious - for exe in `find ${D}/${libexecdir}`; do - chmod +x $exe - done -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb new file mode 100644 index 000000000..27e3f92cc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb @@ -0,0 +1,82 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase bash-completion gettext upstream-version-is-even + +DEPENDS += "libsecret glib-2.0 glib-2.0-native gconf libgudev shadow-native" + +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" + +SRC_URI[archive.md5sum] = "9a9a97a63bb9e87258d48086a6bdacaa" +SRC_URI[archive.sha256sum] = "f311b7c5f855ebe259960c00c7d03c812e040928ecb0ec093b50a4f16b3bcf26" + + +EXTRA_OEMESON = " \ + -Dbluray=false \ + -Dgoa=false \ + -Dgoogle=false \ + -Dnfs=false \ +" + +PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" + +FILES_${PN} += " \ + ${datadir}/glib-2.0 \ + ${datadir}/GConf \ + ${datadir}/dbus-1/services \ + ${libdir}/gio/modules/*.so \ + ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ +" + +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES_${PN}-dev += "${libdir}/gio/modules/*.la" + +FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" +FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" +FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" + +RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" + +PACKAGECONFIG ?= "libgphoto2 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ + " + +PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" +PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" +PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" +PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" +PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" +PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" +PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" +PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" +PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" +PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" + +# needs meta-filesystems +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" + +# libcdio-paranoia recipe doesn't exist yet +PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi + + # After rebuilds (not from scracth) it can happen that the executables in + # libexec ar missing executable permission flag. Not sure but it came up + # during transition to meson. Looked into build files and logs but could + # not find suspicious + for exe in `find ${D}/${libexecdir}`; do + chmod +x $exe + done +} diff --git a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index e3a0c2eb6..b47d59e2d 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -83,6 +83,21 @@ do_install_append () { } do_compile_ptest () { + for x in `find ${B} -name Makefile -exec grep -l buildtest-TESTS {} \;`; do + dir=`dirname ${x}` + case $dir in + *cpp/t) ;; + *snmp_bc/t) if ${@bb.utils.contains('PACKAGECONFIG','snmp-bc','true','false',d)} + then + oe_runmake -C ${dir} buildtest-TESTS + fi + ;; + *) oe_runmake -C ${dir} buildtest-TESTS ;; + esac + done +} + +ack_do_compile_ptest () { for x in `find ${B} -name Makefile -exec grep -l buildtest-TESTS {} \;`; do dir=`dirname ${x}` upper=`dirname ${dir}` diff --git a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb deleted file mode 100644 index 451671dda..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Analyze Suspend" -DESCRIPTION = "analyze-suspend is a tool for system developers to visualize \ -the activity between suspend and resume, allowing them to identify \ -inefficiencies and bottlenecks." -HOMEPAGE = "https://01.org/suspendresume" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -# Apart from the listed RDEPENDS, analyze-suspend depends on some features -# provided by the kernel. These options are: -# - CONFIG_PM_DEBUG=y -# - CONFIG_PM_SLEEP_DEBUG=y -# - CONFIG_FTRACE=y -# - CONFIG_FUNCTION_TRACER=y -# - CONFIG_FUNCTION_GRAPH_TRACER=y - -RDEPENDS_${PN} += "python-core python-datetime python-stringold" - -SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" -SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" - -S = "${WORKDIR}/git" - -do_install() { - install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py - install -Dm 0644 README ${D}${docdir}/analyze-suspend/README -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb new file mode 100644 index 000000000..bb0aad341 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb @@ -0,0 +1,29 @@ +SUMMARY = "Analyze Suspend" +DESCRIPTION = "analyze-suspend is a tool for system developers to visualize \ +the activity between suspend and resume, allowing them to identify \ +inefficiencies and bottlenecks." +HOMEPAGE = "https://01.org/suspendresume" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" + +# Apart from the listed RDEPENDS, analyze-suspend depends on some features +# provided by the kernel. These options are: +# - CONFIG_PM_DEBUG=y +# - CONFIG_PM_SLEEP_DEBUG=y +# - CONFIG_FTRACE=y +# - CONFIG_FUNCTION_TRACER=y +# - CONFIG_FUNCTION_GRAPH_TRACER=y + +RDEPENDS_${PN} += "python-core python-datetime python-stringold" + +SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" +SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" + +S = "${WORKDIR}/git" + +do_install() { + install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py + install -Dm 0644 README ${D}${docdir}/analyze-suspend/README +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch b/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch new file mode 100644 index 000000000..8f18f4872 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch @@ -0,0 +1,30 @@ +From 57456b5d034c8965b11eceed1bf861c98a18c324 Mon Sep 17 00:00:00 2001 +From: "jenkins@kwaj" +Date: Wed, 11 Sep 2019 13:43:45 -0700 +Subject: [PATCH] memrchr: Use _ISOC11_SOURCE only with glibc + +this is a glibc feature test macro which is not available +on other libraries e.g. musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/extmem/memrchr_s.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/extmem/memrchr_s.c b/src/extmem/memrchr_s.c +index 8d10a7b9..e73d3579 100644 +--- a/src/extmem/memrchr_s.c ++++ b/src/extmem/memrchr_s.c +@@ -36,7 +36,7 @@ + #endif + + #ifdef HAVE_MEMRCHR +-#ifndef _ISOC11_SOURCE ++#if defined (__GLIBC__) && !defined(_ISOC11_SOURCE) + extern void *memrchr(const void *, int, size_t); + #endif + #endif +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb deleted file mode 100644 index b4c125faf..000000000 --- a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Safe C Library" - -LICENSE = "safec" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d0eb7dfc57806a006fcbc4e389cf164" -SECTION = "lib" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "62e6b2df55084316d027165d286e46beb40513dc" -SRC_URI = "git://github.com/rurban/safeclib.git" - -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' - -RDEPENDS_${PN} = "perl" diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb new file mode 100644 index 000000000..c9ace3b0b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "Safe C Library" + +LICENSE = "safec" +LIC_FILES_CHKSUM = "file://COPYING;md5=6d0eb7dfc57806a006fcbc4e389cf164" +SECTION = "lib" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" +SRCREV = "a99a052a56da409638c9fe7e096a5ae6661ca7cb" +SRC_URI = "git://github.com/rurban/safeclib.git \ + file://0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch \ +" + +CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" + +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' + +RDEPENDS_${PN} = "perl" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index 34b0b7a3b..c0d08db17 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -102,7 +102,7 @@ do_compile() { powerpc|powerpc64) export android_arch=linux-ppc ;; - i586|x86_64) + i586|i686|x86_64) export android_arch=linux-x86 ;; esac diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch index b1c37fc8e..edf903552 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch @@ -1,3 +1,8 @@ +From d1d7b616219fd47736c804ff4c2f393d7184a75b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 23 Dec 2018 16:58:04 -0800 +Subject: [PATCH] chromium: stack pointer clobber + Do not add stack pointer to clobber list it was being ignored until gcc 9.0 became capable @@ -7,9 +12,23 @@ of flagging this silent ignoring via [1] Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] Signed-off-by: Khem Raj +--- + src/third_party/lss/linux_syscall_support.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Index: b/src/third_party/lss/linux_syscall_support.h +=================================================================== --- a/src/third_party/lss/linux_syscall_support.h +++ b/src/third_party/lss/linux_syscall_support.h +@@ -1957,7 +1957,7 @@ struct kernel_statfs { + LSS_ENTRYPOINT \ + "pop %%ebx" \ + args \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res) + #undef _syscall0 + #define _syscall0(type,name) \ @@ -1966,7 +1966,7 @@ struct kernel_statfs { __asm__ volatile(LSS_ENTRYPOINT \ : "=a" (__res) \ @@ -19,6 +38,33 @@ Signed-off-by: Khem Raj LSS_RETURN(type,__res); \ } #undef _syscall1 +@@ -2014,7 +2014,7 @@ struct kernel_statfs { + : "i" (__NR_##name), "ri" ((long)(arg1)), \ + "c" ((long)(arg2)), "d" ((long)(arg3)), \ + "S" ((long)(arg4)), "D" ((long)(arg5)) \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res); \ + } + #undef _syscall6 +@@ -2036,7 +2036,7 @@ struct kernel_statfs { + : "i" (__NR_##name), "0" ((long)(&__s)), \ + "c" ((long)(arg2)), "d" ((long)(arg3)), \ + "S" ((long)(arg4)), "D" ((long)(arg5)) \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res); \ + } + LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, +@@ -2122,7 +2122,7 @@ struct kernel_statfs { + : "0"(-EINVAL), "i"(__NR_clone), + "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), + "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) +- : "esp", "memory", "ecx", "edx", "esi", "edi"); ++ : "memory", "ecx", "edx", "esi", "edi"); + LSS_RETURN(int, __res); + } + @@ -2407,7 +2407,7 @@ struct kernel_statfs { "d"(LSS_SYSCALL_ARG(parent_tidptr)), "r"(LSS_SYSCALL_ARG(newtls)), diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index ab2fd7f72..241b4baa3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -26,8 +26,8 @@ inherit pkgconfig autotools-brokensep gettext BBCLASSEXTEND += "nativesdk" -EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html" -EXTRA_OECONF_append_toolchain-gcc = " --disable-werror " +EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror" + do_configure() { ./bootstrap nosubmodule install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/jimtcl/autosetup diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index d738d2d93..3d537e5b6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -56,6 +56,9 @@ EXTRA_OECONF = "--enable-mbstring \ ${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 = " \ @@ -71,10 +74,9 @@ PACKAGECONFIG_class-native = "" PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" -PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ - --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ - --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ - ,--without-mysql --without-mysqli --without-pdo-mysql \ +PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ + --with-pdo-mysql=mysqlnd \ + ,--without-mysqli --without-pdo-mysql \ ,mysql5" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ @@ -92,11 +94,11 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ 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" -CFLAGS_append_aarch64 = " -O2" EXTRA_OEMAKE = "INSTALL_ROOT=${D}" @@ -175,7 +177,7 @@ do_install_append_class-target() { 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/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf + 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 @@ -214,7 +216,7 @@ 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" +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" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf index ef79a0cc9..f7f46d205 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf @@ -1,6 +1,6 @@ # Taken from http://wiki.apache.org/httpd/PHP-FPM -LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so +LoadModule proxy_module /usr/libexec/apache2/modules/mod_proxy.so +LoadModule proxy_fcgi_module /usr/libexec/apache2/modules/mod_proxy_fcgi.so ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/ 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 index 4d656da0f..23ab7ca8e 100644 --- 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 @@ -17,11 +17,3 @@ SRC_URI_append_class-target = " \ SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee" SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4" - -PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ - --with-pdo-mysql=mysqlnd \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch new file mode 100644 index 000000000..04af15dd8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -0,0 +1,32 @@ +From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 10 Sep 2019 20:04:26 -0700 +Subject: [PATCH] src: Do not reset FINAL_LIBS + +This helps case where additional libraries are needed to be passed from +environment to get it going + +e.g. -latomic is needed on clang/x86 to provide for 64bit atomics + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 7f7c625..c71dd3b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -66,7 +66,7 @@ endif + + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) +-FINAL_LIBS=-lm ++FINAL_LIBS+=-lm + DEBUG=-g -ggdb + + ifeq ($(uname_S),SunOS) +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb index 5df5312a0..45ea29b70 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -11,6 +11,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://oe-use-libc-malloc.patch \ file://Fixed-stack-trace-generation-on-aarch64.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://redis.conf \ file://init-redis-server \ file://redis.service \ @@ -25,11 +26,13 @@ SRC_URI[sha256sum] = "1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a08758 inherit autotools-brokensep update-rc.d systemd useradd +FINAL_LIBS_x86_toolchain-clang = "-latomic" +export FINAL_LIBS + USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" GROUPADD_PARAM_${PN} = "--system redis" - REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" do_compile_prepend() { diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch deleted file mode 100644 index d49ce0138..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0c94e32b218c31f31a7988577fb9bec595034e7b Mon Sep 17 00:00:00 2001 -From: Todd Brandt -Date: Fri, 10 May 2019 15:10:35 -0700 -Subject: [PATCH] bootgraph.py: - handle boot time start grep better, the regex - needs more complexity - -Upstream-Status: Backport [https://github.com/intel/pm-graph/commit/0c94e32b218c31f31a7988577fb9bec595034e7b] - -Signed-off-by: Liwei Song ---- - bootgraph.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bootgraph.py b/bootgraph.py -index a2b1b1897307..d7f4bd152bf1 100755 ---- a/bootgraph.py -+++ b/bootgraph.py -@@ -333,9 +333,9 @@ def parseKernelLog(): - if(not sysvals.stamp['kernel']): - sysvals.stamp['kernel'] = sysvals.kernelVersion(msg) - continue -- m = re.match('.* setting system clock to (?P.*) UTC.*', msg) -+ m = re.match('.* setting system clock to (?P[0-9\-]*)[ A-Z](?P[0-9:]*) UTC.*', msg) - if(m): -- bt = datetime.strptime(m.group('t'), '%Y-%m-%d %H:%M:%S') -+ bt = datetime.strptime(m.group('d')+' '+m.group('t'), '%Y-%m-%d %H:%M:%S') - bt = bt - timedelta(seconds=int(ktime)) - data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S') - sysvals.stamp['time'] = bt.strftime('%B %d %Y, %I:%M:%S %p') --- -2.22.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch new file mode 100644 index 000000000..25c87093f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch @@ -0,0 +1,39 @@ +From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001 +From: Naveen Saini +Date: Wed, 11 Sep 2019 11:31:07 +0800 +Subject: [PATCH] sleepgraph.py: use python3 + +Already compatible with Python 3. +Same goes for bootgraph.py + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Naveen Saini +--- + bootgraph.py | 2 +- + sleepgraph.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bootgraph.py b/bootgraph.py +index d3b99a1..efb5714 100755 +--- a/bootgraph.py ++++ b/bootgraph.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # SPDX-License-Identifier: GPL-2.0-only + # + # Tool for analyzing boot timing +diff --git a/sleepgraph.py b/sleepgraph.py +index 1794c79..cfed8e0 100755 +--- a/sleepgraph.py ++++ b/sleepgraph.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # SPDX-License-Identifier: GPL-2.0-only + # + # Tool for analyzing suspend/resume timing +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb deleted file mode 100644 index a9f540ab8..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Timing analysis tools for suspend/resume/boot" -DESCRIPTION = "This tool suite is designed to assist kernel and OS developers \ -in optimizing their linux stack's suspend/resume & boot time." -HOMEPAGE = "https://01.org/pm-graph" -LICENSE = "GPL-2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" -SRC_URI = "git://github.com/intel/pm-graph.git \ - file://0001-Makefile-fix-multilib-build-failure.patch \ - file://0001-bootgraph.py.patch \ -" -S = "${WORKDIR}/git" - -COMPATIBLE_HOST='(i.86|x86_64).*' -EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" - -do_install() { - oe_runmake install -} - -RDEPENDS_${PN} += "python-core python-threading python-datetime python-subprocess python-compression" diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb new file mode 100644 index 000000000..63a9fa88e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "Timing analysis tools for suspend/resume/boot" +DESCRIPTION = "This tool suite is designed to assist kernel and OS developers \ +in optimizing their linux stack's suspend/resume & boot time." +HOMEPAGE = "https://01.org/pm-graph" +LICENSE = "GPL-2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" + +SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" +SRC_URI = "git://github.com/intel/pm-graph.git \ + file://0001-Makefile-fix-multilib-build-failure.patch \ + file://0001-sleepgraph.py-use-python3.patch \ +" +S = "${WORKDIR}/git" + +COMPATIBLE_HOST='(i.86|x86_64).*' +EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" + +do_install() { + oe_runmake install +} + +RDEPENDS_${PN} += "python3-core python3-threading python3-datetime python3-compression" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb index a62e5ef23..ac463038a 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb @@ -13,6 +13,21 @@ S = "${WORKDIR}/git" inherit cmake +# We don't want path to eigen3 in ceres-solver RSS to be +# used by components which use CeresConfig.cmake from their +# own RSS +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(Eigen3_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/share/eigen3/cmake) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: list(APPEND EIGEN_INCLUDE_DIR_HINTS ceres-solver/1.14-r0/recipe-sysroot/usr/include/eigen3) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog) +SSTATE_SCAN_FILES += "*.cmake" + +PACKAGECONFIG ??= "" + +# suitesparse* recipes will be in meta-ros layer +PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr" +PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" +PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" + # Only a static library and headers are created RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dev = "${PN}-staticdev" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch new file mode 100644 index 000000000..07cb88ffb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch @@ -0,0 +1,78 @@ +From 4a3e707402032788e09282e0f54fdf82c8a0f8fc Mon Sep 17 00:00:00 2001 +From: Marian Csontos +Date: Mon, 19 Aug 2019 14:54:43 +0200 +Subject: [PATCH] configure: Fix setting of CLDFLAGS default + +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] +Signed-off-by: Peter Kjellerstedt + +diff --git a/configure b/configure +index ff3a59b6b..4c8476502 100755 +--- a/configure ++++ b/configure +@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : + fi + case "$host_os" in + linux*) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" + # equivalent to -rdynamic + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym +@@ -3098,7 +3098,7 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -3111,7 +3111,7 @@ case "$host_os" in + BLKDEACTIVATE=no + ;; + *) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ;; + esac + +diff --git a/configure.ac b/configure.ac +index 5da694631..830edb8da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([]) + AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) + case "$host_os" in + linux*) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" + # equivalent to -rdynamic + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym +@@ -51,7 +51,7 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -64,7 +64,7 @@ case "$host_os" in + BLKDEACTIVATE=no + ;; + *) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ;; + esac + +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index f358663b0..6c95bfd02 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,6 +15,7 @@ SRC_URI = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \ " SRC_URI[md5sum] = "5fc07da5461a3794a751dcfc355827d5" SRC_URI[sha256sum] = "550ba750239fd75b7e52c9877565cabffef506bbf6d7f6f17b9700dee56c720f" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb deleted file mode 100644 index 903817f18..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.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] = "0aac1fcb6466f8b7bdf51871264c7e83" -SRC_URI[sha256sum] = "f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8" - -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.80.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb new file mode 100644 index 000000000..338af1d87 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.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] = "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/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 126680c57..82b803a4d 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -18,7 +18,10 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5 S = "${WORKDIR}/Remmina-v${PV}" -inherit cmake +inherit cmake distro_features_check + +# depends on avahi-ui with this restriction +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc new file mode 100644 index 000000000..773e9dd77 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "Powerful Python library for atomic file writes" +HOMEPAGE = "https://github.com/untitaker/python-atomicwrites" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91cc36cfafeefb7863673bcfcb1d4da4" + +SRC_URI[md5sum] = "ce11f780a4ce0fce8a55d64494a88178" +SRC_URI[sha256sum] = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb new file mode 100644 index 000000000..c7b41d603 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-atomicwrites.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc index 23e18563a..de02d9a4a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc @@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" -SRC_URI[md5sum] = "af8fea5f3df6f7f81e9c6cbc6dd7c1e8" -SRC_URI[sha256sum] = "945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" +SRC_URI[md5sum] = "cadd4e373fc08f649fa39b82aed9ad96" +SRC_URI[sha256sum] = "e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb deleted file mode 100644 index adfe6238e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb new file mode 100644 index 000000000..adfe6238e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc new file mode 100644 index 000000000..a4c31b2b2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Python package for creating and manipulating graphs and networks" +LICENSE = "BSD-3-Clause" + +inherit pypi + +PYPI_PACKAGE_EXT = "zip" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-decorator \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb deleted file mode 100644 index bc0c6863d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python package for creating and manipulating graphs and networks" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde" - -SRC_URI[md5sum] = "4a2c2a62dfc46ba7d594daca7c834995" -SRC_URI[sha256sum] = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1" - -PYPI_PACKAGE_EXT = "zip" - -inherit pypi setuptools - -RDEPENDS_${PN} += "python-2to3" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb new file mode 100644 index 000000000..648f0312f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb @@ -0,0 +1,8 @@ +require python-networkx.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde" + +SRC_URI[md5sum] = "82608a3686fb3e61f20cf13bfd3c1b4a" +SRC_URI[sha256sum] = "45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b" + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index b58cdea96..7ef6092b5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -20,6 +20,7 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-py \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-six \ + ${PYTHON_PN}-atomicwrites \ " FILESEXTRAPATHS_prepend := "${THISDIR}/python-pytest:" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb new file mode 100644 index 000000000..9f306e60d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-atomicwrites.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb deleted file mode 100644 index 70f674b22..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb new file mode 100644 index 000000000..70f674b22 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb index 594e93dca..f5c5c7e1a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb @@ -7,4 +7,3 @@ RDEPENDS_${PN} += "\ ${PYTHON_PN}-attrs \ ${PYTHON_PN}-wcwidth \ " -PNBLACKLIST[python3-cmd2] = "Nothing RPROVIDES 'python3-colorama' (but python3-cmd2_0.9.16.bb RDEPENDS on or otherwise requires it)" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb new file mode 100644 index 000000000..d041d0e6c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "XML bomb protection for Python stdlib modules" +DESCRIPTION = "Python package with modified subclasses of all stdlib XML \ +parsers that prevent any potentially malicious operation." + +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=056fea6a4b395a24d0d278bf5c80249e" + +SRC_URI[md5sum] = "a59741f675c4cba649de40a99f732897" +SRC_URI[sha256sum] = "f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb new file mode 100644 index 000000000..8786a1484 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb @@ -0,0 +1,9 @@ +SUMMARY = "A python package that provides useful locks." +HOMEPAGE = "https://github.com/harlowja/fasteners" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" + +SRC_URI[md5sum] = "440f8ab461c8fed941355860d8669556" +SRC_URI[sha256sum] = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb new file mode 100644 index 000000000..8feb6daa3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb @@ -0,0 +1,8 @@ +require python-networkx.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b68290ee1026b204170a23bbdb27a4fd" + +SRC_URI[md5sum] = "320d3f6c7872732baa63cedafddadea9" +SRC_URI[sha256sum] = "8311ddef63cf5c5c5e7c1d0212dd141d9a1fe3f474915281b73597ed5f1d4e3d" + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.bb new file mode 100644 index 000000000..be63fed02 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.bb @@ -0,0 +1,9 @@ +SUMMARY = "This module provides ctypes-based bindings for the native libvlc API of the VLC video player." +HOMEPAGE = "wiki.videolan.org/PythonBinding" +LICENSE = "LGPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[md5sum] = "e128abf7115d6513582bd460c0e74485" +SRC_URI[sha256sum] = "821bca0dbe08fbff97a65e56ff2318ad7d499330876579c39f01f3fb38c7b679" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb new file mode 100644 index 000000000..b94929d8c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb @@ -0,0 +1,14 @@ +SUMMARY = "Small add-on for the python requests http library. Makes use of python 3.2’s concurrent.futures or the backport for prior versions of python." +HOMEPAGE = "https://github.com/ross/requests-futures" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e1e50798d0afe0e1f87594c6619a2fa5" + +SRC_URI[md5sum] = "e20dc6f063c70888a7f8225e349b6682" +SRC_URI[sha256sum] = "33aa8a3b7892850701707d7e094b1e1ce7c4f7a36ff2a1dcc2da4e01a1a00f7e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + python3-requests \ +" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb new file mode 100644 index 000000000..7e7b5235e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb @@ -0,0 +1,9 @@ +SUMMARY = "unittest-based test runner with Ant/JUnit like XML reporting" +HOMEPAGE = "https://github.com/pycontribs/xmlrunner" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fa964f202b6ae067ed5828fe43c77c1a" + +SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3" +SRC_URI[sha256sum] = "5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index c44efb6cd..3cbab22c3 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -25,9 +25,9 @@ EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl \ LIBTOOL=${STAGING_DIR_TARGET}${bindir_crossscripts}/${HOST_SYS}-libtool" do_install() { - install -d ${D}${libdir}/apache2/modules - install -m 755 ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules + install -d ${D}${libexecdir}/apache2/modules + install -m 755 ${B}/.libs/mod_websocket.so ${D}${libexecdir}/apache2/modules } -FILES_${PN} += " ${libdir}/apache2/modules/* " -FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* " +FILES_${PN} += " ${libexecdir}/apache2/modules/* " +FILES_${PN}-dbg += " ${libexecdir}/apache2/modules/.debug/* " diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index 811c2c522..d179e84e3 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \ file://0002-Makefiles-does-not-build-contrib-dir.patch \ " -SRCREV = "2c4146832061635273d153a5174c85fb1d967d57" -PV = "1.16.0+git${SRCPV}" +SRCREV = "588ce5a7b18999dfa66698cd3a2f005f7a3c31cf" +PV = "1.17.0" # patch to disable timeout because timeout are not available with actual version # of core-utils @@ -25,6 +25,9 @@ DEPENDS += "zlib util-linux" inherit pkgconfig autotools-brokensep useradd systemd +LIBS_toolchain-clang_x86 = "-latomic" +export LIBS + #systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "netdata.service" -- cgit v1.2.3 From 7e36d53b0e80af58191fd2680577e6d766af55c7 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 16 Sep 2019 07:44:26 -0400 Subject: meta-openembedded: subtree update:a2928764c2..19528ba2a6 Adrian Bunk (1): libqmi: Replace clang patch with configure option Bartosz Golaszewski (3): yad: new package zenity: new package unclutter-xfixes: new package Khem Raj (2): mycroft: Remove alsa-oss from rdeps bigbuckbunny: Use faster download mirrors Oleksandr Kravchuk (21): capnproto: update to 0.7.0 ddrescue: update to 1.24 fmt: update to 6.0.0 jsonrpc: update to 1.2.0 libburn: update to 1.5.0 libdvdread: update to 6.0.1 libev: update to 4.27 libmodplug: update to 0.8.9.0 libnice: update to 0.1.16 libopus: update to 1.3.1 libsass: update to 3.6.1 libuv: update to 1.32.0 libsocketcan: update to 0.0.11 tree: update to 1.8.0 xclock: update to 1.0.9 xcursorgen: update to 1.0.7 xfontsel: update to 1.0.6 xmag: update to 1.0.6 xmessage: update to 1.0.5 xorg-sgml-doctools: update to 1.11 evtest: update to 1.34 Peiran Hong (1): tcpdump: Fix CVE-2017-16808 Change-Id: I4f2f575382cd34404d10470ece0aae7620487902 Signed-off-by: Brad Bishop --- .../zenity/0001-build-don-t-generate-manual.patch | 50 +++++ .../recipes-gnome/zenity/zenity_3.32.0.bb | 24 +++ .../recipes-multimedia/mycroft/mycroft_19.2.3.bb | 2 +- .../sample-content/bigbuckbunny-1080p.bb | 2 +- .../sample-content/bigbuckbunny-480p.bb | 2 +- .../sample-content/bigbuckbunny-720p.bb | 2 +- ...2017-16808-AoE-Add-a-missing-bounds-check.patch | 61 ++++++ .../recipes-support/tcpdump/tcpdump_4.9.2.bb | 1 + .../recipes-connectivity/libev/libev_4.25.bb | 19 -- .../recipes-connectivity/libev/libev_4.27.bb | 19 ++ .../libqmi/libqmi/0001-Detect-clang.patch | 85 -------- .../recipes-connectivity/libqmi/libqmi_1.22.2.bb | 2 +- .../recipes-connectivity/libuv/libuv_1.27.0.bb | 18 -- .../recipes-connectivity/libuv/libuv_1.32.0.bb | 19 ++ .../recipes-devtools/capnproto/capnproto_0.6.1.bb | 24 --- .../recipes-devtools/capnproto/capnproto_0.7.0.bb | 24 +++ .../recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb | 24 +++ .../recipes-devtools/jsonrpc/jsonrpc_git.bb | 28 --- .../recipes-extended/ddrescue/ddrescue_1.22.bb | 45 ---- .../recipes-extended/ddrescue/ddrescue_1.24.bb | 44 ++++ .../socketcan/libsocketcan_0.0.10.bb | 14 -- .../socketcan/libsocketcan_0.0.11.bb | 14 ++ .../0001-build-use-autotools.patch | 238 +++++++++++++++++++++ .../unclutter-xfixes/unclutter-xfixes_1.5.bb | 23 ++ .../xcursorgen/xcursorgen_1.0.5.bb | 14 -- .../xcursorgen/xcursorgen_1.0.7.bb | 14 ++ .../recipes-graphics/xorg-app/xclock_1.0.5.bb | 11 - .../recipes-graphics/xorg-app/xclock_1.0.9.bb | 10 + .../recipes-graphics/xorg-app/xfontsel_1.0.5.bb | 13 -- .../recipes-graphics/xorg-app/xfontsel_1.0.6.bb | 13 ++ .../recipes-graphics/xorg-app/xmag_1.0.5.bb | 11 - .../recipes-graphics/xorg-app/xmag_1.0.6.bb | 11 + .../recipes-graphics/xorg-app/xmessage_1.0.4.bb | 10 - .../recipes-graphics/xorg-app/xmessage_1.0.5.bb | 10 + .../xorg-doc/xorg-sgml-doctools_1.11.bb | 12 ++ .../xorg-doc/xorg-sgml-doctools_1.7.bb | 12 -- .../meta-oe/recipes-graphics/yad/yad_4.1.bb | 17 ++ .../recipes-multimedia/libburn/libburn_1.4.0.bb | 11 - .../recipes-multimedia/libburn/libburn_1.5.0.bb | 11 + .../libdvdread/libdvdread_5.0.3.bb | 13 -- .../libdvdread/libdvdread_6.0.1.bb | 12 ++ .../libmodplug/libmodplug_0.8.8.5.bb | 21 -- .../libmodplug/libmodplug_0.8.9.0.bb | 20 ++ .../recipes-multimedia/libopus/libopus_1.1.3.bb | 55 ----- .../recipes-multimedia/libopus/libopus_1.3.1.bb | 55 +++++ .../recipes-support/farsight/libnice_0.1.14.bb | 39 ---- .../recipes-support/farsight/libnice_0.1.16.bb | 40 ++++ .../meta-oe/recipes-support/fmt/fmt_5.3.0.bb | 16 -- .../meta-oe/recipes-support/fmt/fmt_6.0.0.bb | 15 ++ .../meta-oe/recipes-support/sass/libsass_3.6.1.bb | 13 ++ .../meta-oe/recipes-support/sass/libsass_git.bb | 13 -- .../meta-oe/recipes-support/tree/tree_1.7.0.bb | 21 -- .../meta-oe/recipes-support/tree/tree_1.8.0.bb | 21 ++ .../evtest/add_missing_limits_h_include.patch | 37 ++++ .../meta-oe/recipes-test/evtest/evtest_1.34.bb | 16 ++ .../meta-oe/recipes-test/evtest/evtest_git.bb | 17 -- 56 files changed, 873 insertions(+), 515 deletions(-) create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.25.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/yad/yad_4.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.16.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/fmt/fmt_5.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/tree/tree_1.8.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch create mode 100644 meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb delete mode 100644 meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch new file mode 100644 index 000000000..488548667 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch @@ -0,0 +1,50 @@ +From 38eeb345fdfca0298b11427aa942b68e627ba10e Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski +Date: Thu, 12 Sep 2019 13:14:55 +0200 +Subject: [PATCH] build: don't generate manual + +We don't have yelp in yocto and even if we did it would pull in +webkitgtk just to generate help. Just remove the manual generation +altogether. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Bartosz Golaszewski +--- + Makefile.am | 3 +-- + configure.ac | 5 ----- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 81ae6a7..bd073dd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,8 +4,7 @@ AM_CPPFLAGS = src + SUBDIRS = \ + src \ + po \ +- data \ +- help ++ data + + EXTRA_DIST = \ + autogen.sh \ +diff --git a/configure.ac b/configure.ac +index 5dccdb0..f88b2c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,11 +115,6 @@ GETTEXT_PACKAGE=zenity + AC_SUBST([GETTEXT_PACKAGE]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) + +-# ******************************* +-# User manual +-# ******************************* +-YELP_HELP_INIT +- + # ******************************* + + AC_SUBST([AM_CPPFLAGS]) +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb new file mode 100644 index 000000000..295288bfb --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Display dialog boxes from the command line and shell scripts" +SECTION = "x11/gnome" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit distro_features_check gnomebase gettext + +DEPENDS = "gtk+3" + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-build-don-t-generate-manual.patch \ +" + +SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a" +SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95" +GNOME_COMPRESS_TYPE="xz" + +do_install_append() { + # Remove gdialog compatibility helper - we don't want to pull in perl + rm ${D}${bindir}/gdialog +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb index becd0bf79..b03a90083 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb @@ -64,7 +64,7 @@ RDEPENDS_${PN} += "python3-pip \ " # Mycroft uses Alsa, PulseAudio and Flac -RDEPENDS_${PN} += "alsa-oss alsa-utils alsa-plugins alsa-tools" +RDEPENDS_${PN} += "alsa-utils alsa-plugins alsa-tools" RDEPENDS_${PN} += "pulseaudio pulseaudio-misc pulseaudio-server" RDEPENDS_${PN} += "flac" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb index a80fc10ac..cee386c2a 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb @@ -3,7 +3,7 @@ LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" -SRC_URI = "http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_1080p_surround.avi" +SRC_URI = "http://themazzone.com/big_buck_bunny_1080p_surround.avi" SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a" SRC_URI[sha256sum] = "69fe2cfe7154a6e752688e3a0d7d6b07b1605bbaf75b56f6470dc7b4c20c06ea" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb index 59ac4788c..d395b9206 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb @@ -3,7 +3,7 @@ LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" -SRC_URI = "http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi" +SRC_URI = "https://archive.org/download/BigBuckBunny/big_buck_bunny_480p_surround-fix.avi" SRC_URI[md5sum] = "ed7ed01e9aefba8ddd77c13332cec120" SRC_URI[sha256sum] = "40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db044634f" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb index 21b8f8f0f..20d562749 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb @@ -3,7 +3,7 @@ LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" -SRC_URI = "http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi" +SRC_URI = "https://archive.org/download/BigBuckBunny/big_buck_bunny_720p_surround.avi" SRC_URI[md5sum] = "0da8fe124595f5b206d64cb1400bbefc" SRC_URI[sha256sum] = "b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06edcd528c" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch new file mode 100644 index 000000000..919f2b009 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch @@ -0,0 +1,61 @@ +From c45443a0d3e16b92622bea6b589e5930e8f0d815 Mon Sep 17 00:00:00 2001 +From: Peiran Hong +Date: Fri, 13 Sep 2019 17:02:57 -0400 +Subject: [PATCH] CVE-2017-16808/AoE: Add a missing bounds check. + +--- + netdissect.h | 12 ++++++++++++ + print-aoe.c | 1 + + 2 files changed, 13 insertions(+) + +diff --git a/netdissect.h b/netdissect.h +index 089b0406..cd05fdb9 100644 +--- a/netdissect.h ++++ b/netdissect.h +@@ -69,6 +69,11 @@ typedef struct { + typedef unsigned char nd_uint8_t; + typedef signed char nd_int8_t; + ++/* ++ * Use this for MAC addresses. ++ */ ++#define MAC_ADDR_LEN 6 /* length of MAC addresses */ ++ + /* snprintf et al */ + + #include +@@ -309,12 +314,19 @@ struct netdissect_options { + ((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \ + (uintptr_t)&(var) <= (uintptr_t)ndo->ndo_snapend - (l))) + ++#define ND_TTEST_LEN(p, l) \ ++ (IS_NOT_NEGATIVE(l) && \ ++ ((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \ ++ (uintptr_t)(p) <= (uintptr_t)ndo->ndo_snapend - (l))) ++ + /* True if "var" was captured */ + #define ND_TTEST(var) ND_TTEST2(var, sizeof(var)) + + /* Bail if "l" bytes of "var" were not captured */ + #define ND_TCHECK2(var, l) if (!ND_TTEST2(var, l)) goto trunc + ++#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) goto trunc ++ + /* Bail if "var" was not captured */ + #define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var)) + +diff --git a/print-aoe.c b/print-aoe.c +index 97e93df2..ac097a04 100644 +--- a/print-aoe.c ++++ b/print-aoe.c +@@ -325,6 +325,7 @@ aoev1_reserve_print(netdissect_options *ndo, + goto invalid; + /* addresses */ + for (i = 0; i < nmacs; i++) { ++ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); + ND_PRINT((ndo, "\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp))); + cp += ETHER_ADDR_LEN; + } +-- +2.21.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb index 038c1617f..9bd861cd4 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb @@ -12,6 +12,7 @@ SRC_URI = " \ file://avoid-absolute-path-when-searching-for-libdlpi.patch \ file://add-ptest.patch \ file://run-ptest \ + file://0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch \ " SRC_URI[md5sum] = "9bbc1ee33dab61302411b02dd0515576" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.25.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.25.bb deleted file mode 100644 index 9456e51f1..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.25.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A full-featured and high-performance event loop that is loosely \ -modelled after libevent." -HOMEPAGE = "http://software.schmorp.de/pkg/libev.html" -LICENSE = "BSD-2-Clause | GPL-2.0+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" - -SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" -SRC_URI[md5sum] = "911daf566534f745726015736a04f04a" -SRC_URI[sha256sum] = "78757e1c27778d2f3795251d9fe09715d51ce0422416da4abb34af3929c02589" - -inherit autotools - -EXTRA_OECONF += "--with-pic" - -do_install_append() { - # Avoid conflicting with libevent. The provided compatibility layer is - # still basic so drop it for now. - rm ${D}${includedir}/event.h -} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb new file mode 100644 index 000000000..b72b7af4f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb @@ -0,0 +1,19 @@ +SUMMARY = "A full-featured and high-performance event loop that is loosely \ +modelled after libevent." +HOMEPAGE = "http://software.schmorp.de/pkg/libev.html" +LICENSE = "BSD-2-Clause | GPL-2.0+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" + +SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" +SRC_URI[md5sum] = "d38925fbc030153fe674c4e0e864a69a" +SRC_URI[sha256sum] = "2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e" + +inherit autotools + +EXTRA_OECONF += "--with-pic" + +do_install_append() { + # Avoid conflicting with libevent. The provided compatibility layer is + # still basic so drop it for now. + rm ${D}${includedir}/event.h +} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch deleted file mode 100644 index 7a3429b9d..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 4cfb728804157e8f3c69e11ba4df449d8f76388f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 20 Oct 2016 04:42:26 +0000 -Subject: [PATCH] Detect clang - -Check for clang compiler since we need to disable -unused-function warning for clang, at same time -pass werror when checking for compiler options if -werror is enabled so spurious options do not get -enabled. Only the ones that are supported by given -compiler are accepted. - -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - m4/compiler-warnings.m4 | 29 +++++++++++++++++++++++++---- - 1 file changed, 25 insertions(+), 4 deletions(-) - -diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4 -index de4a8b0..e4ba718 100644 ---- a/m4/compiler-warnings.m4 -+++ b/m4/compiler-warnings.m4 -@@ -2,10 +2,30 @@ AC_DEFUN([LIBQMI_COMPILER_WARNINGS], - [AC_ARG_ENABLE(more-warnings, - AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), - set_more_warnings="$enableval",set_more_warnings=error) -+ -+# Clang throws a lot of warnings when it does not understand a flag. Disable -+# this warning for now so other warnings are visible. -+AC_MSG_CHECKING([if compiling with clang]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ -+#ifndef __clang__ -+ not clang -+#endif -+ ]])], -+ [CLANG=yes], -+ [CLANG=no] -+) -+AC_MSG_RESULT([$CLANG]) -+AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) -+CFLAGS="$CFLAGS $CLANG_FLAGS" -+LDFLAGS="$LDFLAGS $CLANG_FLAGS" -+ - AC_MSG_CHECKING(for more warnings) - if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -std=gnu89 $CFLAGS" -+ if test "x$set_more_warnings" = xerror; then -+ WERROR="-Werror" -+ fi - - for option in -Wmissing-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement -Wstrict-prototypes \ -@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - -Wmissing-include-dirs -Waggregate-return \ - -Wformat-security -Wtype-limits; do - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -+ CFLAGS="$CFLAGS $option $WERROR" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" -+ else -+ CFLAGS="$SAVE_CFLAGS $option" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done -+ CFLAGS="$CFLAGS $WERROR" - unset option -- if test "x$set_more_warnings" = xerror; then -- CFLAGS="$CFLAGS -Werror" -- fi -+ unset WERROR - else - AC_MSG_RESULT(no) - fi --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.2.bb index da13286b4..3b2fe51bb 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.2.bb @@ -12,7 +12,6 @@ DEPENDS = "glib-2.0 glib-2.0-native" inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-Detect-clang.patch \ " SRC_URI[md5sum] = "3fd831c1b0de4a4432be628432a960ff" SRC_URI[sha256sum] = "f1f1e514a89b1dcba05cf7274895e7301a2da4c947b7c2f17acb84fc74038227" @@ -21,3 +20,4 @@ PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" +EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb deleted file mode 100644 index 6fd0339c5..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb +++ /dev/null @@ -1,18 +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 = "a4fc9a66cc35256dbc4dcd67c910174f05b6daa6" -SRC_URI = "git://github.com/libuv/libuv" -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.32.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb new file mode 100644 index 000000000..c7fa3c10f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.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 = "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-devtools/capnproto/capnproto_0.6.1.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb deleted file mode 100644 index 6ca3613db..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Cap'n Proto serialization/RPC system" -DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " -HOMEPAGE = "https://github.com/sandstorm-io/capnproto" -SECTION = "console/tools" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=0a5b5b742baf10cc1c158579eba7fb1d" - -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}" -SRCREV = "c949a18da5f041a36cc218c5c4b79c7705999b4f" - -S = "${WORKDIR}/git/c++" - -inherit cmake - -EXTRA_OECMAKE += "\ - -DBUILD_TESTING=OFF \ -" - -FILES_${PN}-compiler = "${bindir}" - -PACKAGE_BEFORE_PN = "${PN}-compiler" -RDEPENDS_${PN}-dev += "${PN}-compiler" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb new file mode 100644 index 000000000..c6bab5ec2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Cap'n Proto serialization/RPC system" +DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " +HOMEPAGE = "https://github.com/sandstorm-io/capnproto" +SECTION = "console/tools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" + +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}" +SRCREV = "3f44c6db0f0f6c0cab0633f15f15d0a2acd01d19" + +S = "${WORKDIR}/git/c++" + +inherit cmake + +EXTRA_OECMAKE += "\ + -DBUILD_TESTING=OFF \ +" + +FILES_${PN}-compiler = "${bindir}" + +PACKAGE_BEFORE_PN = "${PN}-compiler" +RDEPENDS_${PN}-dev += "${PN}-compiler" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb new file mode 100644 index 000000000..b23775708 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "C++ framework for json-rpc 1.0 and 2.0" +DESCRIPTION = "JsonRpc-Cpp is an OpenSource implementation of JSON-RPC \ + protocol in C++. JSON-RPC is a lightweight remote procedure \ + call protocol similar to XML-RPC." +HOMEPAGE = "https://github.com/cinemast/libjson-rpc-cpp" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4e728c5b36018f6c383b4b9efd9c8840" +SECTION = "libs" + +DEPENDS = "curl jsoncpp libmicrohttpd hiredis" + +SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp" +SRCREV = "4ed5b00dcc409405a19e6d8c6478f703153430e1" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO \ + -DBUILD_SHARED_LIBS=YES -DBUILD_STATIC_LIBS=YES \ + -DCMAKE_LIBRARY_PATH=${libdir} \ +" + +FILES_${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_git.bb b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_git.bb deleted file mode 100644 index aea11b082..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "C++ framework for json-rpc 1.0 and 2.0" -DESCRIPTION = "JsonRpc-Cpp is an OpenSource implementation of JSON-RPC \ - protocol in C++. JSON-RPC is a lightweight remote procedure \ - call protocol similar to XML-RPC." -HOMEPAGE = "https://github.com/cinemast/libjson-rpc-cpp" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4e728c5b36018f6c383b4b9efd9c8840" -SECTION = "libs" -DEPENDS = "curl jsoncpp libmicrohttpd hiredis" - -PV = "1.1.1+git${SRCPV}" -# v1.1.1 -SRCREV = "319783c635cf8cabcc1a980495c99a88f9ebbd97" - -SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ - " - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO \ - -DBUILD_SHARED_LIBS=YES -DBUILD_STATIC_LIBS=YES \ - -DCMAKE_LIBRARY_PATH=${libdir} \ -" - -FILES_${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake" diff --git a/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb b/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb deleted file mode 100644 index 2df7db9e8..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Data recovery tool" -DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \ - from one file or block device (hard disc, cdrom, etc) to another, \ - trying hard to rescue data in case of read errors." -HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html" -SECTION = "console" -LICENSE = "GPLv2+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ - file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f" - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz" -SRC_URI[md5sum] = "49c845ed89d25b534842e40366154cb4" -SRC_URI[sha256sum] = "09857b2e8074813ac19da5d262890f722e5f7900e521a4c60354cef95eea10a7" - -# This isn't already added by base.bbclass -do_unpack[depends] += "lzip-native:do_populate_sysroot" - -CONFIGUREOPTS = "\ - '--srcdir=${S}' \ - '--prefix=${prefix}' \ - '--exec-prefix=${exec_prefix}' \ - '--bindir=${bindir}' \ - '--datadir=${datadir}' \ - '--infodir=${infodir}' \ - '--sysconfdir=${sysconfdir}' \ - 'CXX=${CXX}' \ - 'CPPFLAGS=${CPPFLAGS}' \ - 'CXXFLAGS=${CXXFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ -" -EXTRA_OEMAKE = "" - -do_configure () { - ${S}/configure ${CONFIGUREOPTS} -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install - # Info dir listing isn't interesting at this point so remove it if it exists. - if [ -e "${D}${infodir}/dir" ]; then - rm -f ${D}${infodir}/dir - fi -} - diff --git a/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb b/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb new file mode 100644 index 000000000..52bd11b1a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb @@ -0,0 +1,44 @@ +SUMMARY = "Data recovery tool" +DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \ + from one file or block device (hard disc, cdrom, etc) to another, \ + trying hard to rescue data in case of read errors." +HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html" +SECTION = "console" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ + file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f" + +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz" +SRC_URI[md5sum] = "8ac89f833c0df221723e33b447e230fe" +SRC_URI[sha256sum] = "4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087" + +# This isn't already added by base.bbclass +do_unpack[depends] += "lzip-native:do_populate_sysroot" + +CONFIGUREOPTS = "\ + '--srcdir=${S}' \ + '--prefix=${prefix}' \ + '--exec-prefix=${exec_prefix}' \ + '--bindir=${bindir}' \ + '--datadir=${datadir}' \ + '--infodir=${infodir}' \ + '--sysconfdir=${sysconfdir}' \ + 'CXX=${CXX}' \ + 'CPPFLAGS=${CPPFLAGS}' \ + 'CXXFLAGS=${CXXFLAGS}' \ + 'LDFLAGS=${LDFLAGS}' \ +" +EXTRA_OEMAKE = "" + +do_configure () { + ${S}/configure ${CONFIGUREOPTS} +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + # Info dir listing isn't interesting at this point so remove it if it exists. + if [ -e "${D}${infodir}/dir" ]; then + rm -f ${D}${infodir}/dir + fi +} diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb deleted file mode 100644 index 60ca58016..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Control basic functions in socketcan from userspace" -HOMEPAGE = "http://www.pengutronix.de" -SECTION = "libs/network" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1" - -SRCREV = "51f1610160a1707f026f8c2d714a6f7aa3ca232b" - -SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb new file mode 100644 index 000000000..0debe47e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb @@ -0,0 +1,14 @@ +SUMMARY = "Control basic functions in socketcan from userspace" +HOMEPAGE = "http://www.pengutronix.de" +SECTION = "libs/network" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1" + +SRCREV = "0ff01ae7e4d271a7b81241e7a7026bfcea0add3f" + +SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch new file mode 100644 index 000000000..25771168c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch @@ -0,0 +1,238 @@ +From 2a5cf5021b56bc92c9953d2c82e8c90502d22c97 Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski +Date: Fri, 13 Sep 2019 10:20:53 +0200 +Subject: [PATCH] build: use autotools + +This removes the hand-crafted Makefile in favor of standardized autotools +build configuration. This is done to allow for easy cross-compilation of +this project. + +Upstream-Status: Submitted + +Signed-off-by: Bartosz Golaszewski +--- + .gitignore | 17 ++++++++++++ + Makefile | 66 --------------------------------------------- + Makefile.am | 10 +++++++ + configure.ac | 36 +++++++++++++++++++++++++ + include/Makefile.am | 9 +++++++ + man/Makefile.am | 7 +++++ + obj/.gitkeep | 0 + src/Makefile.am | 13 +++++++++ + 8 files changed, 92 insertions(+), 66 deletions(-) + delete mode 100644 Makefile + create mode 100644 Makefile.am + create mode 100644 configure.ac + create mode 100644 include/Makefile.am + create mode 100644 man/Makefile.am + delete mode 100644 obj/.gitkeep + create mode 100644 src/Makefile.am + +diff --git a/.gitignore b/.gitignore +index af88e94..4e7355a 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -3,3 +3,20 @@ obj/*.o + man/*.1 + man/*.xml + test/GLOB* ++*.o ++ ++# autotools stuff ++.deps/ ++Makefile ++Makefile.in ++aclocal.m4 ++autom4te.cache/ ++autostuff/ ++config.h ++config.h.in ++config.h.in~ ++config.log ++config.status ++configure ++m4/ ++stamp-h1 +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index 6264da0..0000000 +--- a/Makefile ++++ /dev/null +@@ -1,66 +0,0 @@ +-TARGET = unclutter +-VERSION = 1.5 +-SDIR = src +-IDIR = include +-ODIR = obj +- +-INSTALL = install +-PREFIX = /usr +- +-BINDIR = $(PREFIX)/bin +-MANDIR = $(PREFIX)/share/man/man1 +-LICENSEDIR = $(PREFIX)/share/licenses/$(TARGET) +- +-CC = gcc +-LD = $(CC) +-PKG_CONFIG = pkg-config +- +-CPPFLAGS += -D'__VERSION="${VERSION}"' "-I$(IDIR)" +- +-CFLAGS += -std=gnu99 +-CFLAGS += -Wall -Wundef -Wshadow -Wformat-security +- +-LDFLAGS += $(shell $(PKG_CONFIG) --libs x11 xi xfixes) +-# libev has no pkg-config support +-LDFLAGS += -lev +- +-INCS = $(wildcard $(IDIR)/*.h) +-SRCS = $(wildcard $(SDIR)/*.c) +-OBJS = $(patsubst %,$(ODIR)/%,$(notdir $(SRCS:.c=.o))) +- +-MANS = man/unclutter-xfixes.1 +- +-.NOTPARALLEL: +- +-.PHONY: all +-all: clean $(TARGET) mans +- +-.PHONY: $(TARGET) +-$(TARGET): $(OBJS) +- $(LD) $(OBJS) $(LDFLAGS) -o "$(TARGET)" +- +-$(ODIR)/%.o: $(SDIR)/%.c $(INCS) +- $(CC) $(CPPFLAGS) $(CFLAGS) -o "$@" -c "$<" +- +-.PHONY: install +-install: $(TARGET) mans +- $(INSTALL) -Dm 0755 "$(TARGET)" "$(DESTDIR)$(BINDIR)/$(TARGET)" +- $(INSTALL) -Dm 0644 man/unclutter-xfixes.1 "$(DESTDIR)$(MANDIR)/unclutter.1" +- $(INSTALL) -Dm 0644 -t "$(DESTDIR)$(LICENSEDIR)/" LICENSE +- +-.PHONY: uninstall +-uninstall: +- $(RM) "$(DESTDIR)$(BINDIR)/$(TARGET)" +- $(RM) "$(DESTDIR)$(MANDIR)/unclutter.1" +- $(RM) "$(DESTDIR)$(LICENSEDIR)/LICENSE" +- +-.PHONY: mans +-mans: $(MANS) +- +-$(MANS): %.1: %.man +- a2x --no-xmllint -f manpage "$<" +- +-.PHONY: clean +-clean: +- $(RM) $(TARGET) $(OBJS) +- $(RM) man/*.1 man/*.xml +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..38ecaa1 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,10 @@ ++ACLOCAL_AMFLAGS = -I m4 ++AUTOMAKE_OPTIONS = foreign ++SUBDIRS = include src ++ ++if HAS_A2X ++SUBDIRS += man ++endif ++ ++licensedir = $(datadir)/licenses/unclutter ++license_DATA = LICENSE +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..1d59197 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,36 @@ ++AC_PREREQ(2.61) ++ ++AC_INIT([unclutter-xfixes], 1.6) ++AC_DEFINE_UNQUOTED([VERSION], ["$PACKAGE_VERSION"]) ++ ++AC_CONFIG_AUX_DIR([autostuff]) ++AC_CONFIG_MACRO_DIRS([m4]) ++AM_INIT_AUTOMAKE([foreign subdir-objects]) ++ ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ++ ++AC_CONFIG_SRCDIR([src]) ++AC_CONFIG_HEADER([config.h]) ++ ++AM_PROG_AR ++AC_PROG_CC ++AC_PROG_INSTALL ++ ++# libev has no pkg-config support ++AC_CHECK_HEADERS([ev.h], [], [AC_MSG_ERROR([ev.h not found - please install libev])]) ++ ++PKG_CHECK_MODULES([X11], [x11 xi xfixes]) ++ ++AC_CHECK_PROG([has_a2x], [a2x], [true], [false]) ++AM_CONDITIONAL([HAS_A2X], [test "x$has_a2x" = xtrue]) ++if test "x$has_a2x" = xfalse ++then ++ AC_MSG_NOTICE([a2x not found - needed to generate man pages]) ++fi ++ ++AC_CONFIG_FILES([Makefile ++ include/Makefile ++ src/Makefile ++ man/Makefile]) ++ ++AC_OUTPUT +diff --git a/include/Makefile.am b/include/Makefile.am +new file mode 100644 +index 0000000..90d8bbc +--- /dev/null ++++ b/include/Makefile.am +@@ -0,0 +1,9 @@ ++noinst_HEADERS = \ ++ all.h \ ++ cursor.h \ ++ event.h \ ++ extensions.h \ ++ externals.h \ ++ globals.h \ ++ types.h \ ++ util.h +diff --git a/man/Makefile.am b/man/Makefile.am +new file mode 100644 +index 0000000..7856e6a +--- /dev/null ++++ b/man/Makefile.am +@@ -0,0 +1,7 @@ ++unclutter-xfixes.1: ++ a2x --no-xmllint -f manpage unclutter-xfixes.man ++ ++dist_man1_MANS = unclutter-xfixes.1 ++ ++clean-local: ++ rm -f unclutter-xfixes.1 +diff --git a/obj/.gitkeep b/obj/.gitkeep +deleted file mode 100644 +index e69de29..0000000 +diff --git a/src/Makefile.am b/src/Makefile.am +new file mode 100644 +index 0000000..c7f0729 +--- /dev/null ++++ b/src/Makefile.am +@@ -0,0 +1,13 @@ ++AM_CFLAGS = -D'__VERSION="${VERSION}"' "-I$(top_srcdir)/include" ++AM_CFLAGS += -std=gnu99 -Wall -Wundef -Wshadow -Wformat-security ++AM_CFLAGS += $(X11_CFLAGS) ++AM_LDFLAGS = -lev $(X11_LIBS) ++ ++bin_PROGRAMS = unclutter ++ ++unclutter_SOURCES = \ ++ cursor.c \ ++ event.c \ ++ extensions.c \ ++ unclutter.c \ ++ util.c +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb new file mode 100644 index 000000000..a566bc18a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb @@ -0,0 +1,23 @@ +SUMMARY = "Remove idle cursor image from screen." +DESCRIPTION = "This is a rewrite of the popular tool unclutter, but using the x11-xfixes extension." +AUTHOR = "Ingo Bürk" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b25d2c4cca175f44120d1b8e67cb358d" + +SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \ + file://0001-build-use-autotools.patch" +SRCREV = "10fd337bb77e4e93c3380f630a0555372778a948" + +inherit autotools pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = "libev libx11 libxi libxfixes" + +S = "${WORKDIR}/git" + +do_install_append() { + # LICENSE is installed to /usr/share/licenses but we don't want it in the package + rm -rf ${D}${datadir} +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb deleted file mode 100644 index a21dc42a9..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "ManishSingh" -LIC_FILES_CHKSUM = "file://COPYING;md5=bd1fb9ee90eead85f7b171807b3ab4f2" - -DEPENDS = "libpng libxcursor" - -SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "09f56978a62854534deacc8aa8ff3031" -SRC_URI[sha256sum] = "bc7171a0fa212da866fca2301241630e2009aea8c4ddb75f21b51a31c2e4c581" - -inherit distro_features_check autotools pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb new file mode 100644 index 000000000..3f4bfaaf1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb @@ -0,0 +1,14 @@ +LICENSE = "ManishSingh" +LIC_FILES_CHKSUM = "file://COPYING;md5=bd1fb9ee90eead85f7b171807b3ab4f2" + +DEPENDS = "libpng libxcursor" + +SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "25cc7ca1ce5dcbb61c2b471c55e686b5" +SRC_URI[sha256sum] = "35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d" + +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb deleted file mode 100644 index cf970d5d6..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "analog / digital clock for X" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=857759ade8f2ddde5c7b32ef7356ea36" - -DEPENDS += " libxaw libxrender libxft libxkbfile libxt" - -SRC_URI[md5sum] = "eaf124bbc9d13e1a12a29faaa2ed3612" -SRC_URI[sha256sum] = "53a9169e24f3814fbfcfee3ca0b98637840a3156ed7c7e36ae03940fabae4c9a" - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb new file mode 100644 index 000000000..31c553eee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb @@ -0,0 +1,10 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc + +SUMMARY = "analog / digital clock for X" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=857759ade8f2ddde5c7b32ef7356ea36" + +DEPENDS += " libxaw libxrender libxft libxkbfile libxt" + +SRC_URI[md5sum] = "437522a96f424f68fc64ed34ece9b211" +SRC_URI[sha256sum] = "cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb deleted file mode 100644 index c74b29194..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb +++ /dev/null @@ -1,13 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "xfontsel provides point and click selection of X11 font names" -HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xfontsel/" -SECTION = "x11/app" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=4669d2703c60d585cc29ba7e9a69bcb3" -DEPENDS += " libxaw" - -LIC_FILES_CHKSUM = "file://COPYING;md5=4669d2703c60d585cc29ba7e9a69bcb3" - -SRC_URI[md5sum] = "a40302b88c599b63e3d3d412e02871e6" -SRC_URI[sha256sum] = "170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb new file mode 100644 index 000000000..e9260240d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.6.bb @@ -0,0 +1,13 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc + +SUMMARY = "xfontsel provides point and click selection of X11 font names" +HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xfontsel/" +SECTION = "x11/app" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4669d2703c60d585cc29ba7e9a69bcb3" +DEPENDS += " libxaw" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4669d2703c60d585cc29ba7e9a69bcb3" + +SRC_URI[md5sum] = "13150ff98846bf6d9a14bee00697fa47" +SRC_URI[sha256sum] = "25aa0b7c4262f5e99c07c2b96e00e4eb25b7e53f94fa803942af9d0e8da3001c" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb deleted file mode 100644 index d57742180..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "xmag is a tool to magnify parts of the screen" -HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xmag/" -SECTION = "x11/app" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387" -DEPENDS += " libxaw libxt" - -SRC_URI[md5sum] = "280b81cb09d1903aa868a058d90128ad" -SRC_URI[sha256sum] = "4ace8795cf756be4ba387f30366045594ce26adda2f5ffe1f8e896825d0932c6" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb new file mode 100644 index 000000000..ab74f5bd6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb @@ -0,0 +1,11 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc + +SUMMARY = "xmag is a tool to magnify parts of the screen" +HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xmag/" +SECTION = "x11/app" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387" +DEPENDS += " libxaw libxt" + +SRC_URI[md5sum] = "8aaa41374935d697ee55d7dc9de70781" +SRC_URI[sha256sum] = "87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb deleted file mode 100644 index 9960706d0..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "Display a message or query in a window" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=73c7f696a728de728d7446cbca814cc5" - -DEPENDS += "libxaw" - -SRC_URI[md5sum] = "2dd5ae46fa18abc9331bc26250a25005" -SRC_URI[sha256sum] = "bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb new file mode 100644 index 000000000..23cfb26c7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.5.bb @@ -0,0 +1,10 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc + +SUMMARY = "Display a message or query in a window" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=73c7f696a728de728d7446cbca814cc5" + +DEPENDS += "libxaw" + +SRC_URI[md5sum] = "e50ffae17eeb3943079620cb78f5ce0b" +SRC_URI[sha256sum] = "373dfb81e7a6f06d3d22485a12fcde6e255d58c6dee1bbaeb00c7d0caa9b2029" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb new file mode 100644 index 000000000..85687611e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.11.bb @@ -0,0 +1,12 @@ +require xorg-doc-common.inc +PE = "1" +PR = "${INC_PR}.0" + +DEPENDS += "util-macros" + +LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449" + +SRC_URI[md5sum] = "ee6dc0a8a693a908857af328b2462661" +SRC_URI[sha256sum] = "e71ce1df82dcc51eb14be6f42171dcc6bdd11ef46c0c605d6da8af12bd73b74c" + +FILES_${PN} += " /usr/share/sgml/X11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb deleted file mode 100644 index 80f1f008b..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xorg-doc-common.inc -PE = "1" -PR = "${INC_PR}.0" - -DEPENDS += "util-macros" - -LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449" - -SRC_URI[md5sum] = "2588efb3f49f7fc6ecf41ce42e0b2e5e" -SRC_URI[sha256sum] = "84fd94e5c50556e6f77501485f8a48724cf3c95c6d58480bc280258ba14580c8" - -FILES_${PN} += " /usr/share/sgml/X11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/yad/yad_4.1.bb b/meta-openembedded/meta-oe/recipes-graphics/yad/yad_4.1.bb new file mode 100644 index 000000000..c69f47dcd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/yad/yad_4.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "Yet Another Dialog" +DESCRIPTION = "Program allowing you to display GTK+ dialog boxes from command line or shell scripts." +AUTHOR = "Victor Ananjevsky" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "git://github.com/v1cont/yad.git" +SRCREV = "3857a0a8822fc0a7206e804f15cc17b85a5f8ce2" + +inherit autotools gsettings + +DEPENDS = "gtk+3 glib-2.0-native intltool-native" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${datadir}/icons/" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb deleted file mode 100644 index 91fe69338..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for reading, mastering and writing optical discs" -HOMEPAGE = "http://libburnia-project.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" - -SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "82ff94bb04e78eac9b12c7546f005d6f" -SRC_URI[sha256sum] = "6c975abae4ae1f80e47fc5d1e235f85157f73e954c84627a5ef85d8b1b95ae94" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.0.bb new file mode 100644 index 000000000..612000e67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "Library for reading, mastering and writing optical discs" +HOMEPAGE = "http://libburnia-project.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" + +SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "b32edefdd9a978edc65aacddfe7c588a" +SRC_URI[sha256sum] = "582b12c236c1365211946f2fe3c254976af37bbec244051f7742a98ded9be2bd" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb deleted file mode 100644 index 050672599..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "DVD access multimeda library" -SECTION = "libs/multimedia" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" -SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" - -SRC_URI[md5sum] = "b7b7d2a782087ed2a913263087083715" -SRC_URI[sha256sum] = "321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b" - -inherit autotools lib_package binconfig pkgconfig - -CONFIGUREOPTS_remove = "--disable-silent-rules" - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.1.bb new file mode 100644 index 000000000..d68e792ba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "DVD access multimeda library" +SECTION = "libs/multimedia" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" + +SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" +SRC_URI[md5sum] = "b9eeaaaf3c41b1c3cb6c1622e7219aeb" +SRC_URI[sha256sum] = "28ce4f0063883ca4d37dfd40a2f6685503d679bca7d88d58e04ee8112382d5bd" + +inherit autotools lib_package binconfig pkgconfig + +CONFIGUREOPTS_remove = "--disable-silent-rules" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb deleted file mode 100644 index 1070246c8..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Library for reading mod-like audio files" -HOMEPAGE = "http://modplug-xmms.sf.net" - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" - -SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" -SRC_URI[md5sum] = "5f30241db109d647781b784e62ddfaa1" -SRC_URI[sha256sum] = "77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-option-checking" - -# NOTE: autotools_stage_all does nothing here, we need to do it manually -do_install_append() { - install -d ${D}${includedir}/libmodplug - install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug - install -m 0644 ${S}/src/modplug.h ${D}${includedir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb new file mode 100644 index 000000000..398daae08 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Library for reading mod-like audio files" +HOMEPAGE = "http://modplug-xmms.sf.net" + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" + +SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" +SRC_URI[md5sum] = "5ba16981e6515975e9a68a58d5ba69d1" +SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-option-checking" + +# NOTE: autotools_stage_all does nothing here, we need to do it manually +do_install_append() { + install -d ${D}${includedir}/libmodplug + install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug + install -m 0644 ${S}/src/modplug.h ${D}${includedir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb deleted file mode 100644 index 1512a1d7d..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Opus Audio Codec" -DESCRIPTION = "The Opus codec is designed for interactive \ -speech and audio transmission over the Internet. It is \ -designed by the IETF Codec Working Group and incorporates \ -technology from Skype's SILK codec and Xiph.Org's CELT codec." -HOMEPAGE = "http://www.opus-codec.org/" -SECTION = "libs/multimedia" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" - -SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" -SRC_URI[md5sum] = "32bbb6b557fe1b6066adc0ae1f08b629" -SRC_URI[sha256sum] = "58b6fe802e7e30182e95d0cde890c0ace40b6f125cffc50635f0ad2eef69b633" - -S = "${WORKDIR}/opus-${PV}" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[fixed-point] = "--enable-fixed-point,," -PACKAGECONFIG[float-approx] = "--enable-float-approx,," - -EXTRA_OECONF = " \ - --with-NE10-includes=${STAGING_DIR_TARGET}${includedir} \ - --with-NE10-libraries=${STAGING_DIR_TARGET}${libdir} \ - --enable-asm \ - --enable-intrinsics \ - --enable-custom-modes \ -" - -# ne10 is available only for armv7a, armv7ve and aarch64 -DEPENDS_append_aarch64 = " ne10" -DEPENDS_append_armv7a = " ne10" -DEPENDS_append_armv7ve = " ne10" - -python () { - if d.getVar('TARGET_FPU') in [ 'soft' ]: - d.appendVar('PACKAGECONFIG', ' fixed-point') -} - -# Fails to build with thumb-1 (qemuarm) -#| {standard input}: Assembler messages: -#| {standard input}:389: Error: selected processor does not support Thumb mode `smull r5,r7,r1,r4' -#| {standard input}:418: Error: selected processor does not support Thumb mode `smull r5,r6,r4,r1' -#| {standard input}:448: Error: selected processor does not support Thumb mode `smull r4,r5,r1,r0' -#| {standard input}:474: Error: selected processor does not support Thumb mode `smull r0,r4,r8,r1' -#| {standard input}:510: Error: selected processor does not support Thumb mode `smull fp,r0,r10,r1' -#| {standard input}:553: Error: selected processor does not support Thumb mode `smull fp,r1,r10,r3' -#| {standard input}:741: Error: selected processor does not support Thumb mode `smull r3,r0,r6,r10' -#| {standard input}:761: Error: selected processor does not support Thumb mode `smull fp,r2,r3,r9' -#| {standard input}:773: Error: selected processor does not support Thumb mode `smull fp,r3,r5,r8' -#| make[2]: *** [celt/celt.lo] Error 1 -ARM_INSTRUCTION_SET_armv5 = "arm" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb new file mode 100644 index 000000000..19ec12c88 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb @@ -0,0 +1,55 @@ +SUMMARY = "Opus Audio Codec" +DESCRIPTION = "The Opus codec is designed for interactive \ +speech and audio transmission over the Internet. It is \ +designed by the IETF Codec Working Group and incorporates \ +technology from Skype's SILK codec and Xiph.Org's CELT codec." +HOMEPAGE = "http://www.opus-codec.org/" +SECTION = "libs/multimedia" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" + +SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" +SRC_URI[md5sum] = "d7c07db796d21c9cf1861e0c2b0c0617" +SRC_URI[sha256sum] = "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" + +S = "${WORKDIR}/opus-${PV}" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[fixed-point] = "--enable-fixed-point,," +PACKAGECONFIG[float-approx] = "--enable-float-approx,," + +EXTRA_OECONF = " \ + --with-NE10-includes=${STAGING_DIR_TARGET}${includedir} \ + --with-NE10-libraries=${STAGING_DIR_TARGET}${libdir} \ + --enable-asm \ + --enable-intrinsics \ + --enable-custom-modes \ +" + +# ne10 is available only for armv7a, armv7ve and aarch64 +DEPENDS_append_aarch64 = " ne10" +DEPENDS_append_armv7a = " ne10" +DEPENDS_append_armv7ve = " ne10" + +python () { + if d.getVar('TARGET_FPU') in [ 'soft' ]: + d.appendVar('PACKAGECONFIG', ' fixed-point') +} + +# Fails to build with thumb-1 (qemuarm) +#| {standard input}: Assembler messages: +#| {standard input}:389: Error: selected processor does not support Thumb mode `smull r5,r7,r1,r4' +#| {standard input}:418: Error: selected processor does not support Thumb mode `smull r5,r6,r4,r1' +#| {standard input}:448: Error: selected processor does not support Thumb mode `smull r4,r5,r1,r0' +#| {standard input}:474: Error: selected processor does not support Thumb mode `smull r0,r4,r8,r1' +#| {standard input}:510: Error: selected processor does not support Thumb mode `smull fp,r0,r10,r1' +#| {standard input}:553: Error: selected processor does not support Thumb mode `smull fp,r1,r10,r3' +#| {standard input}:741: Error: selected processor does not support Thumb mode `smull r3,r0,r6,r10' +#| {standard input}:761: Error: selected processor does not support Thumb mode `smull fp,r2,r3,r9' +#| {standard input}:773: Error: selected processor does not support Thumb mode `smull fp,r3,r5,r8' +#| make[2]: *** [celt/celt.lo] Error 1 +ARM_INSTRUCTION_SET_armv5 = "arm" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.14.bb b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.14.bb deleted file mode 100644 index 967beeba4..000000000 --- a/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.14.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Interactive Connectivity Establishment library" -DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." -HOMEPAGE = "http://nice.freedesktop.org/wiki/" -SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" -SRC_URI[md5sum] = "c9b9b74b8ae1b3890e4bd93f1b70e8ff" -SRC_URI[sha256sum] = "be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c" - -LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ -" - -DEPENDS = "glib-2.0 gnutls" - -PACKAGECONFIG ??= "gstreamer1.0" -PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" -PACKAGECONFIG[gstreamer1.0] = "--with-gstreamer,--without-gstreamer,gstreamer1.0 gstreamer1.0-plugins-base" - -inherit autotools pkgconfig gtk-doc gobject-introspection - -EXTRA_OECONF += "--without-gstreamer-0.10" - -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" - -do_configure_prepend() { - mkdir ${S}/m4 || true -} - -do_compile_append() { - for i in $(find ${B} -name "*.pc") ; do - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done -} diff --git a/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.16.bb b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.16.bb new file mode 100644 index 000000000..7bd6478d4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.16.bb @@ -0,0 +1,40 @@ +SUMMARY = "Interactive Connectivity Establishment library" +DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." +HOMEPAGE = "http://nice.freedesktop.org/wiki/" + +LICENSE = "LGPLv2.1 & MPLv1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ +" + +SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" +SRC_URI[md5sum] = "5ad936c43d3c6d33117b2c64982f2fd9" +SRC_URI[sha256sum] = "06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf" + +DEPENDS = "glib-2.0 gnutls" + +PACKAGECONFIG ??= "gstreamer1.0" +PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" +PACKAGECONFIG[gstreamer1.0] = "--with-gstreamer,--without-gstreamer,gstreamer1.0 gstreamer1.0-plugins-base" + +inherit autotools pkgconfig gtk-doc gobject-introspection + +EXTRA_OECONF += "--without-gstreamer-0.10" + +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" +FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" + +do_configure_prepend() { + mkdir ${S}/m4 || true +} + +do_compile_append() { + for i in $(find ${B} -name "*.pc") ; do + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done +} diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_5.3.0.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_5.3.0.bb deleted file mode 100644 index be33bb863..000000000 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_5.3.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "open-source formatting library for C++" -DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." -HOMEPAGE = "https://fmt.dev" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c2e38bc8629eac247a73b65c1548b2f0" -SRCREV = "9e554999ce02cf86fcdfe74fe740c4fe3f5a56d5" -PV .= "+git${SRCPV}" - -SRC_URI += "git://github.com/fmtlib/fmt" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.0.0.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.0.0.bb new file mode 100644 index 000000000..c35c77b12 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.0.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "open-source formatting library for C++" +DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." +HOMEPAGE = "https://fmt.dev" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" + +SRC_URI += "git://github.com/fmtlib/fmt" +SRCREV = "7512a55aa3ae309587ca89668ef9ec4074a51a1f" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.1.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.1.bb new file mode 100644 index 000000000..480e984fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "C/C++ port of the Sass CSS precompiler" +HOMEPAGE = "http://sass-lang.com/libsass" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" + +inherit autotools + +SRC_URI = "git://github.com/sass/libsass.git;branch=master" +SRCREV = "4d229af5500be1023883c38c4a675f0ed919839d" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb deleted file mode 100644 index 4c229cdb7..000000000 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "C/C++ port of the Sass CSS precompiler" -HOMEPAGE = "http://sass-lang.com/libsass" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" - -inherit autotools - -SRC_URI = "git://github.com/sass/libsass.git;branch=3.5-stable" -SRCREV = "39e30874b9a5dd6a802c20e8b0470ba44eeba929" -S = "${WORKDIR}/git" -PV = "3.5.5" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb b/meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb deleted file mode 100644 index 5eff55263..000000000 --- a/meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A recursive directory listing command" -HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" -SRC_URI[md5sum] = "abe3e03e469c542d8e157cdd93f4d8a6" -SRC_URI[sha256sum] = "6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12" - -# tree's default CFLAGS for Linux -CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" - -EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" - -do_configure[noexec] = "1" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/${BPN} ${D}${bindir}/ -} diff --git a/meta-openembedded/meta-oe/recipes-support/tree/tree_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/tree/tree_1.8.0.bb new file mode 100644 index 000000000..01b1ac384 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tree/tree_1.8.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "A recursive directory listing command" +HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" +SRC_URI[md5sum] = "715191c7f369be377fc7cc8ce0ccd835" +SRC_URI[sha256sum] = "715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2" + +# tree's default CFLAGS for Linux +CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" + +EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" + +do_configure[noexec] = "1" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/${BPN} ${D}${bindir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch b/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch new file mode 100644 index 000000000..b2bf94fd5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch @@ -0,0 +1,37 @@ +From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Sun, 18 Aug 2019 10:01:06 +0300 +Subject: Add missing limits.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build with musl libc that does not include limits.h indirectly via +other headers. + +evtest.c: In function ‘scan_devices’: +evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’? + char fname[PATH_MAX]; + ^~~~~~~~ + +Signed-off-by: Baruch Siach +Signed-off-by: Peter Hutterer +--- + evtest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/evtest.c b/evtest.c +index 37d4f85..548c203 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -56,6 +56,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 + diff --git a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb new file mode 100644 index 000000000..3b6dc6140 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -0,0 +1,16 @@ +SUMMARY = "Simple tool for input event debugging" +HOMEPAGE = "http://people.freedesktop.org/~whot/evtest/" +AUTHOR = "Vojtech Pavlik " +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "libxml2" + +SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" +SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git \ + file://add_missing_limits_h_include.patch" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb deleted file mode 100644 index fa0d6e2fe..000000000 --- a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Simple tool for input event debugging" -HOMEPAGE = "http://people.freedesktop.org/~whot/evtest/" -AUTHOR = "Vojtech Pavlik " -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "libxml2" - -SRCREV = "ab140a2dab1547f7deb5233be6d94a388cf08b26" -SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git" - -PV = "1.33+${SRCPV}" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig -- cgit v1.2.3 From 63ae87823ca5774411cb29a7aebf35efae85f0b3 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 9 Oct 2019 09:56:13 -0400 Subject: meta-openembedded: subtree update:01d539b324..fd1a0c9210 Adrian Bunk (1): xmlrpc-c: Remove the RDEPENDS on perl Denys Dmytriyenko (1): mariadb: update SRC_URI to use archive.mariadb.org Khem Raj (7): xorg-fonts-100dpi: Change License Custom -> MIT fio: Depend on coreutils-native for fmt utility fio: Fix build when march is armv7ve pmdk: Update to 1.7 README: Document need for 32bit compiler mongodb: Turn system libpcre support into packageconfig grpc: Update to 1.24.1 Otavio Salvador (1): modemmanager: Upgrade 1.10.2 -> 1.10.6 Palmer Dabbelt (1): Add zeus compatibility to all layer.conf files Peiran Hong (1): tcpdump: upgrade 4.9.2 -> 4.9.3 Stefan Agner (1): zram: properly implement systemd service Stefan Wiehler (1): nvme-cli: upgrade 1.6 -> 1.9 Trevor Gamblin (2): gnome-desktop3: upgrade from 3.32.0 to 3.34.0 freeradius: add -latomic for armv5 William A. Kennington III via Openembedded-devel (1): log4cpp: Stop using RC as a variable Change-Id: I9b3bd69a061da11a59d38bce42543cb090b24601 Signed-off-by: Brad Bishop --- meta-openembedded/meta-filesystems/conf/layer.conf | 2 +- meta-openembedded/meta-gnome/conf/layer.conf | 2 +- .../gnome-desktop/gnome-desktop3_3.32.0.bb | 36 ------- .../gnome-desktop/gnome-desktop3_3.34.0.bb | 36 +++++++ meta-openembedded/meta-initramfs/conf/layer.conf | 2 +- meta-openembedded/meta-multimedia/conf/layer.conf | 2 +- meta-openembedded/meta-networking/conf/layer.conf | 2 +- .../freeradius/freeradius_3.0.19.bb | 1 + ....txt-Fix-libraries-installation-for-Linux.patch | 44 ++++---- .../0001-Define-gettid-only-for-glibc-2.30.patch | 115 --------------------- .../recipes-devtools/grpc/grpc_1.22.0.bb | 44 -------- .../recipes-devtools/grpc/grpc_1.24.1.bb | 49 +++++++++ .../tcpdump/tcpdump/add-ptest.patch | 9 +- ...-absolute-path-when-searching-for-libdlpi.patch | 19 ++-- .../recipes-support/tcpdump/tcpdump/run-ptest | 4 +- .../tcpdump/unnecessary-to-check-libpcap.patch | 15 +-- .../recipes-support/tcpdump/tcpdump_4.9.2.bb | 45 -------- .../recipes-support/tcpdump/tcpdump_4.9.3.bb | 51 +++++++++ meta-openembedded/meta-oe/README | 7 ++ meta-openembedded/meta-oe/conf/layer.conf | 2 +- ...01-arch-arm-Consider-armv7ve-arch-as-well.patch | 28 +++++ .../meta-oe/recipes-benchmark/fio/fio_3.16.bb | 3 +- ...Makefile-fix-bash-completion-install-path.patch | 33 ------ .../meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb | 21 ---- .../meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 29 ++++++ .../modemmanager/modemmanager_1.10.2.bb | 57 ---------- .../modemmanager/modemmanager_1.10.6.bb | 57 ++++++++++ .../meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 6 +- .../meta-oe/recipes-dbs/mysql/mariadb.inc | 2 +- .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb | 1 - ...e-__FreeBSD__-to-control-secure_getenv-de.patch | 33 ++++++ .../0003-Makefile-Don-t-build-the-examples.patch | 34 ------ .../meta-oe/recipes-extended/pmdk/pmdk_1.6.bb | 49 --------- .../meta-oe/recipes-extended/pmdk/pmdk_1.7.bb | 49 +++++++++ .../recipes-extended/zram/zram/dev-zram0.swap | 10 ++ .../recipes-extended/zram/zram/zram-swap-deinit | 19 ++++ .../recipes-extended/zram/zram/zram-swap-init | 26 +++++ .../recipes-extended/zram/zram/zram-swap.service | 10 ++ .../recipes-extended/zram/zram/zram.service | 12 --- .../meta-oe/recipes-extended/zram/zram/zramstop | 5 + .../meta-oe/recipes-extended/zram/zram_0.1.bb | 33 ------ .../meta-oe/recipes-extended/zram/zram_0.2.bb | 50 +++++++++ .../xorg-font/xorg-fonts-100dpi.bb | 2 +- .../recipes-support/log4cpp/log4cpp_1.1.2.bb | 4 +- meta-openembedded/meta-perl/conf/layer.conf | 2 +- meta-openembedded/meta-python/conf/layer.conf | 2 +- meta-openembedded/meta-webserver/conf/layer.conf | 2 +- meta-openembedded/meta-xfce/conf/layer.conf | 2 +- 48 files changed, 526 insertions(+), 542 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch delete mode 100644 meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/zram/zram/dev-zram0.swap create mode 100755 meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-deinit create mode 100755 meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init create mode 100644 meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap.service delete mode 100644 meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service create mode 100644 meta-openembedded/meta-oe/recipes-extended/zram/zram/zramstop delete mode 100644 meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf index 5aa2b0c2d..e8bd3628f 100644 --- a/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/meta-openembedded/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_filesystems-layer = "thud warrior" +LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus" diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf index 9ed142198..862d622ee 100644 --- a/meta-openembedded/meta-gnome/conf/layer.conf +++ b/meta-openembedded/meta-gnome/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_gnome-layer = "thud warrior" +LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb deleted file mode 100644 index 85ee5e6cf..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "gnome-desktop" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99" -SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -inherit distro_features_check gtk-doc -REQUIRED_DISTRO_FEATURES += "x11" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb new file mode 100644 index 000000000..77aa3fb61 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +BPN = "gnome-desktop" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +SRC_URI[archive.md5sum] = "3149bbd12eaf6f4420b1a999131ec470" +SRC_URI[archive.sha256sum] = "8d331ee655c1d56b2b97562a07c7a7598ff6706a11ff1cdce97423ebc6b62426" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" + +DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" + +inherit distro_features_check gtk-doc +REQUIRED_DISTRO_FEATURES += "x11" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop3" +FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-initramfs/conf/layer.conf b/meta-openembedded/meta-initramfs/conf/layer.conf index 6e0b00db0..93220b120 100644 --- a/meta-openembedded/meta-initramfs/conf/layer.conf +++ b/meta-openembedded/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "8" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "thud warrior" +LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf index 38aab8d35..74dd4a1b0 100644 --- a/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/meta-openembedded/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "thud warrior" +LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus" diff --git a/meta-openembedded/meta-networking/conf/layer.conf b/meta-openembedded/meta-networking/conf/layer.conf index 6f0046cf3..866bda755 100644 --- a/meta-openembedded/meta-networking/conf/layer.conf +++ b/meta-openembedded/meta-networking/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" -LAYERSERIES_COMPAT_networking-layer = "thud warrior" +LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus" LICENSE_PATH += "${LAYERDIR}/licenses" 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 ded1a67ff..9da15e07a 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 @@ -38,6 +38,7 @@ S = "${WORKDIR}/git" LDFLAGS_append_powerpc = " -latomic" LDFLAGS_append_mipsarch = " -latomic" +LDFLAGS_append_armv5 = " -latomic" EXTRA_OECONF = " --enable-strict-dependencies \ --with-docdir=${docdir}/freeradius-${PV} \ diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch index 3282b5413..e517355d3 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch @@ -29,7 +29,7 @@ Signed-off-by: Alexey Firago set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") -@@ -769,6 +778,10 @@ if(WIN32 AND MSVC) +@@ -777,6 +786,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -51,7 +51,7 @@ Signed-off-by: Alexey Firago target_include_directories(gpr PUBLIC $ $ -@@ -1333,6 +1350,10 @@ if(WIN32 AND MSVC) +@@ -1367,6 +1384,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -62,7 +62,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpc PUBLIC $ $ -@@ -1731,6 +1752,10 @@ if(WIN32 AND MSVC) +@@ -1782,6 +1803,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -73,7 +73,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpc_cronet PUBLIC $ $ -@@ -2744,6 +2769,10 @@ if(WIN32 AND MSVC) +@@ -2869,6 +2894,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -84,7 +84,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpc_unsecure PUBLIC $ $ -@@ -3083,6 +3112,10 @@ if(WIN32 AND MSVC) +@@ -3206,6 +3235,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -95,18 +95,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpc++ PUBLIC $ $ -@@ -3703,6 +3736,10 @@ if(WIN32 AND MSVC) - endif() - endif() - -+if(_gRPC_PLATFORM_LINUX) -+ set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) -+ set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) -+endif() - - target_include_directories(grpc++_cronet - PUBLIC $ $ -@@ -4013,6 +4050,11 @@ protobuf_generate_grpc_cpp( +@@ -3589,6 +3622,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/status/status.proto ) @@ -118,7 +107,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpc++_error_details PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -4147,6 +4189,11 @@ protobuf_generate_grpc_cpp( +@@ -3727,6 +3765,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/reflection/v1alpha/reflection.proto ) @@ -130,7 +119,18 @@ Signed-off-by: Alexey Firago target_include_directories(grpc++_reflection PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -4704,6 +4751,10 @@ if(WIN32 AND MSVC) +@@ -3816,6 +3859,10 @@ target_link_libraries(grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) + ++if(_gRPC_PLATFORM_LINUX) ++ set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) ++ set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) ++endif() + + endif (gRPC_BUILD_TESTS) + if (gRPC_BUILD_TESTS) +@@ -4307,6 +4354,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -141,7 +141,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpc++_unsecure PUBLIC $ $ -@@ -5124,6 +5175,10 @@ if(WIN32 AND MSVC) +@@ -4745,6 +4796,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -152,7 +152,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpc_plugin_support PUBLIC $ $ -@@ -5190,6 +5245,11 @@ protobuf_generate_grpc_cpp( +@@ -4813,6 +4868,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/channelz/channelz.proto ) @@ -164,7 +164,7 @@ Signed-off-by: Alexey Firago target_include_directories(grpcpp_channelz PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -5728,6 +5788,10 @@ if(WIN32 AND MSVC) +@@ -5367,6 +5427,10 @@ if(WIN32 AND MSVC) endif() endif() diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch deleted file mode 100644 index 88b0af7f8..000000000 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch +++ /dev/null @@ -1,115 +0,0 @@ -Upstream-Status: Backport - -From de6255941a5e1c2fb2d50e57f84e38c09f45023d Mon Sep 17 00:00:00 2001 -From: Juanli Shen -Date: Fri, 23 Aug 2019 08:46:09 -0700 -Subject: [PATCH] Fix gettid() naming conflict - ---- - src/core/lib/gpr/log_linux.cc | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc -index 561276f0c20..81026e5689b 100644 ---- a/src/core/lib/gpr/log_linux.cc -+++ b/src/core/lib/gpr/log_linux.cc -@@ -40,7 +40,9 @@ - #include - #include - --static long gettid(void) { return syscall(__NR_gettid); } -+// Not naming it as gettid() to avoid duplicate declarations when complied with -+// GCC 9.1. -+static long local_gettid(void) { return syscall(__NR_gettid); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -70,7 +72,7 @@ void gpr_default_log(gpr_log_func_args* args) { - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); - struct tm tm; - static __thread long tid = 0; -- if (tid == 0) tid = gettid(); -+ if (tid == 0) tid = local_gettid(); - - timer = static_cast(now.tv_sec); - final_slash = strrchr(args->file, '/'); -From 57586a1ca7f17b1916aed3dea4ff8de872dbf853 Mon Sep 17 00:00:00 2001 -From: Benjamin Peterson -Date: Fri, 3 May 2019 08:11:00 -0700 -Subject: [PATCH] Rename gettid() functions. - -glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. ---- - src/core/lib/gpr/log_linux.cc | 6 ++---- - src/core/lib/gpr/log_posix.cc | 4 ++-- - src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- - 3 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc -index 81026e5689b..8b597b4cf2f 100644 ---- a/src/core/lib/gpr/log_linux.cc -+++ b/src/core/lib/gpr/log_linux.cc -@@ -40,9 +40,7 @@ - #include - #include - --// Not naming it as gettid() to avoid duplicate declarations when complied with --// GCC 9.1. --static long local_gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -72,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); - struct tm tm; - static __thread long tid = 0; -- if (tid == 0) tid = local_gettid(); -+ if (tid == 0) tid = sys_gettid(); - - timer = static_cast(now.tv_sec); - final_slash = strrchr(args->file, '/'); -diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc -index b6edc14ab6b..2f7c6ce3760 100644 ---- a/src/core/lib/gpr/log_posix.cc -+++ b/src/core/lib/gpr/log_posix.cc -@@ -31,7 +31,7 @@ - #include - #include - --static intptr_t gettid(void) { return (intptr_t)pthread_self(); } -+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { - char* prefix; - gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", - gpr_log_severity_string(args->severity), time_buffer, -- (int)(now.tv_nsec), gettid(), display_file, args->line); -+ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); - - fprintf(stderr, "%-70s %s\n", prefix, args->message); - gpr_free(prefix); -diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc -index c2d80c08ddb..4a83cb6c215 100644 ---- a/src/core/lib/iomgr/ev_epollex_linux.cc -+++ b/src/core/lib/iomgr/ev_epollex_linux.cc -@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, - } - - #ifndef NDEBUG --static long gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - #endif - - /* pollset->mu lock must be held by the caller before calling this. -@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, - #define WORKER_PTR (&worker) - #endif - #ifndef NDEBUG -- WORKER_PTR->originator = gettid(); -+ WORKER_PTR->originator = sys_gettid(); - #endif - if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { - gpr_log(GPR_INFO, diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb deleted file mode 100644 index a80c574cc..000000000 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb +++ /dev/null @@ -1,44 +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 = "08fd59f039c7cf62614ab7741b3f34527af103c7" -BRANCH = "v1.22.x" -SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ - 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 \ - file://0001-Define-gettid-only-for-glibc-2.30.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 - -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 \ - " - -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.1.bb b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb new file mode 100644 index 000000000..5cfa3aa82 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.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 = "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-support/tcpdump/tcpdump/add-ptest.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index b71435a04..f8ff354fe 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,18 +1,19 @@ -From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001 +From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" -Date: Wed, 22 Oct 2014 10:02:48 +0800 +Date: Wed, 2 Oct 2019 16:57:06 -0400 Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending Signed-off-by: Hongjun.Yang +Signed-off-by: Peiran Hong --- Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 0941f0e..3ce40c6 100644 +index 3b589184..7b10e38c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -437,9 +437,17 @@ distclean: @@ -23,7 +24,7 @@ index 0941f0e..3ce40c6 100644 +buildtest-TESTS: tcpdump + +runtest-PTEST: - (cd tests && ./TESTrun.sh) + (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh ) +install-ptest: + cp -r tests $(DESTDIR) diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch index d82c16053..977ab95b7 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch @@ -1,6 +1,6 @@ -From a2bfd28034d9aa48d8ff109c1314e53bc9779752 Mon Sep 17 00:00:00 2001 +From 02085028cdaf075943c27ebc02bb6de0289ec1d3 Mon Sep 17 00:00:00 2001 From: Andre McCurdy -Date: Wed, 24 Oct 2018 22:26:08 -0700 +Date: Wed, 2 Oct 2019 16:43:48 -0400 Subject: [PATCH] avoid absolute path when searching for libdlpi Let the build environment control library search paths. @@ -8,15 +8,16 @@ Let the build environment control library search paths. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andre McCurdy +Signed-off-by: Peiran Hong --- - configure.in | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index c882909..52aefd6 100644 ---- a/configure.in -+++ b/configure.in -@@ -542,7 +542,7 @@ don't.]) +diff --git a/configure.ac b/configure.ac +index 3401a7a3..6a52485a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -528,7 +528,7 @@ don't.]) fi # libdlpi is needed for Solaris 11 and later. @@ -26,5 +27,5 @@ index c882909..52aefd6 100644 dnl dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", -- -1.9.1 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index c03a8b8ef..2bfb2267d 100755 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest @@ -1,5 +1,5 @@ #!/bin/sh make -k runtest-PTEST | sed -e '/: passed/ s/^/PASS: /g' \ - -e '/: failed/ s/^/FAIL: /g' \ + -e '/: TEST FAILED.*/ s/^/FAIL: /g' \ -e 's/: passed//g' \ - -e 's/: failed//g' + -e 's/: TEST FAILED.*//g' diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index 69d68baac..8793bf7a3 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch @@ -15,15 +15,16 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Roy Li Signed-off-by: Andre McCurdy +Signed-off-by: Peiran Hong --- - configure.in | 4 +++- + configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index b2305a5..c882909 100644 ---- a/configure.in -+++ b/configure.in -@@ -418,7 +418,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. +diff --git a/configure.ac b/configure.ac +index 56e2a624..3401a7a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -404,7 +404,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. AC_SEARCH_LIBS(getrpcbynumber, nsl, AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) @@ -35,5 +36,5 @@ index b2305a5..c882909 100644 # # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate -- -1.9.1 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb deleted file mode 100644 index 9bd861cd4..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" - -DEPENDS = "libpcap" - -SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ - file://unnecessary-to-check-libpcap.patch \ - file://avoid-absolute-path-when-searching-for-libdlpi.patch \ - file://add-ptest.patch \ - file://run-ptest \ - file://0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch \ -" - -SRC_URI[md5sum] = "9bbc1ee33dab61302411b02dd0515576" -SRC_URI[sha256sum] = "798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79" - -inherit autotools-brokensep ptest - -PACKAGECONFIG ?= "openssl" - -PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" -PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl" -PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" - -EXTRA_AUTORECONF += "-I m4" - -do_configure_prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi -} - -do_install_append() { - # make install installs an unneeded extra copy of the tcpdump binary - rm -f ${D}${sbindir}/tcpdump.${PV} -} - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb new file mode 100644 index 000000000..3cd12aee7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb @@ -0,0 +1,51 @@ +SUMMARY = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +SECTION = "net" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" + +DEPENDS = "libpcap" + +RDEPENDS_${PN}-ptest += " make perl \ + perl-module-file-basename \ + perl-module-posix \ + perl-module-carp" + +SRC_URI = " \ + http://www.tcpdump.org/release/${BP}.tar.gz \ + file://unnecessary-to-check-libpcap.patch \ + file://avoid-absolute-path-when-searching-for-libdlpi.patch \ + file://add-ptest.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae" +SRC_URI[sha256sum] = "2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410" + +inherit autotools-brokensep ptest + +PACKAGECONFIG ?= "openssl" + +PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" +PACKAGECONFIG[openssl] = "--with-crypto,--without-openssl --without-crypto,openssl" +PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" +# Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) +PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" + +EXTRA_AUTORECONF += "-I m4" + +do_configure_prepend() { + mkdir -p ${S}/m4 + if [ -f aclocal.m4 ]; then + mv aclocal.m4 ${S}/m4 + fi +} + +do_install_append() { + # make install installs an unneeded extra copy of the tcpdump binary + rm -f ${D}${sbindir}/tcpdump.${PV} +} + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} diff --git a/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README index 0e9f8423b..347816b0d 100644 --- a/meta-openembedded/meta-oe/README +++ b/meta-openembedded/meta-oe/README @@ -7,6 +7,13 @@ URI: git://github.com/openembedded/openembedded-core.git branch: master revision: HEAD +luajit recipe requires host compiler to be able to generate 32bit code when target is 32bit +e.g. arm, so ensure that $CC -m32 is functional on build host, if building this recipe, needed +packages to fullfit this might have different names on different host distributions +e.g. on archlinux based distributions install prerequisites like below + +pacman -S lib32-gcc-libs lib32-glibc + Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' When sending single patches, please use something like: diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index e48fabdf0..2a17eef30 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -29,7 +29,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "thud warrior" +LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch new file mode 100644 index 000000000..983a76fb6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch @@ -0,0 +1,28 @@ +From 2af58909cd9f2862d1dc07836e201361a2cd8d5d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 5 Oct 2019 08:53:22 -0700 +Subject: [PATCH] arch-arm: Consider armv7ve arch as well + +Upstream-Status: Submitted [] + +Signed-off-by: Khem Raj +--- + arch/arch-arm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arch-arm.h b/arch/arch-arm.h +index 78cb2ebe..4f722967 100644 +--- a/arch/arch-arm.h ++++ b/arch/arch-arm.h +@@ -11,7 +11,7 @@ + #define nop __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t") + #define read_barrier() __asm__ __volatile__ ("" : : : "memory") + #define write_barrier() __asm__ __volatile__ ("" : : : "memory") +-#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) ++#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH_7VE__) + #define nop __asm__ __volatile__ ("nop") + #define read_barrier() __sync_synchronize() + #define write_barrier() __sync_synchronize() +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb index 092b2bead..adab61878 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb @@ -10,7 +10,7 @@ SECTION = "console/tests" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libaio zlib" +DEPENDS = "libaio zlib coreutils-native" RDEPENDS_${PN} = "python bash" PACKAGECONFIG_NUMA = "numa" @@ -24,6 +24,7 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl" SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ + file://0001-arch-arm-Consider-armv7ve-arch-as-well.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch deleted file mode 100644 index 154e1401a..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ef64032b34190079aab591c64a25f7535a977390 Mon Sep 17 00:00:00 2001 -From: Stefan Wiehler -Date: Tue, 9 Oct 2018 11:26:34 +0200 -Subject: [PATCH] Makefile: fix bash completion install path - -Change path to bash-completion upstream recommendation used by most -distributions. - -Upstream-Status: Accepted - -Signed-off-by: Stefan Wiehler ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index fa587dd..433bc41 100644 ---- a/Makefile -+++ b/Makefile -@@ -69,8 +69,8 @@ install-bin: default - $(INSTALL) -m 755 nvme $(DESTDIR)$(SBINDIR) - - install-bash-completion: -- $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash_completion.d -- $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash_completion.d/nvme -+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions -+ $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/nvme - - install: install-bin install-man install-bash-completion - --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb deleted file mode 100644 index 9b7e6cd4d..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "NVMe management command line interface" -AUTHOR = "Stefan Wiehler " -HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux" -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ - file://0001-Makefile-fix-bash-completion-install-path.patch \ - " -SRCREV = "642d426faf8a67ed01e90f7c35c0d967f8cc52a3" - -S = "${WORKDIR}/git" - -inherit bash-completion - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb new file mode 100644 index 000000000..256d83f03 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb @@ -0,0 +1,29 @@ +SUMMARY = "NVMe management command line interface" +AUTHOR = "Stefan Wiehler " +HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" +DEPENDS = "util-linux util-linux-native" +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" +SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45" + +S = "${WORKDIR}/git" + +inherit bash-completion systemd + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} \ + UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} +} + +pkg_postinst_ontarget_${PN}() { + ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn +} + +PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" + +FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.2.bb deleted file mode 100644 index 5fe7fb83f..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.2.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" -DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit gnomebase gettext systemd vala gobject-introspection bash-completion - -DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" - -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ - " - -SRC_URI[md5sum] = "dad80b3b4f27c1d6eae7e019542338be" -SRC_URI[sha256sum] = "bbcf6da35da3d72f688675bde91dfed6485845c3fedd1805ae914b71d1b783f2" - -S = "${WORKDIR}/ModemManager-${PV}" - -PACKAGECONFIG ??= "mbim qmi \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ -" - -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," -PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" -# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" -# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. -PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" - -EXTRA_OECONF = " \ - --with-udev-base-dir=${nonarch_base_libdir}/udev \ -" -EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${datadir}/ModemManager \ - ${libdir}/ModemManager \ - ${systemd_unitdir}/system \ -" - -FILES_${PN}-dev += " \ - ${libdir}/ModemManager/*.la \ -" - -FILES_${PN}-staticdev += " \ - ${libdir}/ModemManager/*.a \ -" - -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" - -SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.6.bb new file mode 100644 index 000000000..92d4fe0f4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.6.bb @@ -0,0 +1,57 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit gnomebase gettext systemd vala gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" + +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + " + +SRC_URI[md5sum] = "7452a94f0d1ca361ae51ff1d287c53f5" +SRC_URI[sha256sum] = "3c2ca73782215664141042422759899ca9846440fc26d6223c7cf7ea4dd3c996" + +S = "${WORKDIR}/ModemManager-${PV}" + +PACKAGECONFIG ??= "mbim qmi \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ +" + +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," +PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" + +EXTRA_OECONF = " \ + --with-udev-base-dir=${nonarch_base_libdir}/udev \ +" +EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/ModemManager \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +FILES_${PN}-dev += " \ + ${libdir}/ModemManager/*.la \ +" + +FILES_${PN}-staticdev += " \ + ${libdir}/ModemManager/*.a \ +" + +FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" + +SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb index e7e03a4e1..cd8ccdc8a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb @@ -3,7 +3,7 @@ LICENSE = "SSPL-1 & Apache-2.0 & Zlib" LIC_FILES_CHKSUM = "file://LICENSE-Community.txt;md5=3a865f27f11f43ecbe542d9ea387dcf1 \ file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "openssl libpcre libpcap zlib boost curl python3 \ +DEPENDS = "openssl libpcap zlib boost curl python3 \ python3-setuptools-native \ python3-pyyaml-native python3-cheetah-native \ python3-psutil-native python3-regex-native \ @@ -38,7 +38,7 @@ S = "${WORKDIR}/git" COMPATIBLE_HOST ?= '(x86_64|powerpc64|aarch64).*-linux' -PACKAGECONFIG ??= "tcmalloc" +PACKAGECONFIG ??= "tcmalloc system-pcre" # gperftools compilation fails for arm below v7 because of missing support of # dmb operation. So we use system-allocator instead of tcmalloc PACKAGECONFIG_remove_armv6 = "tcmalloc" @@ -46,6 +46,7 @@ PACKAGECONFIG_remove_libc-musl = "tcmalloc" PACKAGECONFIG[tcmalloc] = "--use-system-tcmalloc,--allocator=system,gperftools," PACKAGECONFIG[shell] = ",--js-engine=none,," +PACKAGECONFIG[system-pcre] = "--use-system-pcre,,libpcre," EXTRA_OESCONS = "--prefix=${D}${prefix} \ LIBPATH=${STAGING_LIBDIR} \ @@ -54,7 +55,6 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \ TARGET_ARCH=${TARGET_ARCH} \ --ssl \ --disable-warnings-as-errors \ - --use-system-pcre \ --use-system-zlib \ --nostrip \ --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 9ddf2bee5..f1c71feeb 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311" -SRC_URI = "https://downloads.mariadb.com/MariaDB/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \ +SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://my.cnf \ file://mysqld.service \ file://install_db.service \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb index 524263760..6c31b6981 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb @@ -15,7 +15,6 @@ SRCREV = "343a3b98e54999d67edb644bcd395aa9784fb16e" S = "${WORKDIR}/git/stable" DEPENDS = "libxml2" -RDEPENDS_${PN} = "perl" inherit autotools-brokensep binconfig pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch new file mode 100644 index 000000000..33f25b6a6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch @@ -0,0 +1,33 @@ +From 7d0732d69a774e28bc46b8b487d9f61bdd8afbff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 6 Oct 2019 18:15:44 -0700 +Subject: [PATCH] os_posix: Use __FreeBSD__ to control secure_getenv definition + +__USE_GNU does not cover all Linux platforms, e.g. when using musl as C +library, __USE_GNU may not be defined but it does provide secure_getenv +so instead of narrowing the else condition, lets speicifically check for +FreeBSD being the platform, since that seems to be the intention here +anyway + +Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/3999] +Signed-off-by: Khem Raj +--- + src/common/os_posix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/os_posix.c b/src/common/os_posix.c +index a9a37ef84..052db2383 100644 +--- a/src/common/os_posix.c ++++ b/src/common/os_posix.c +@@ -346,7 +346,7 @@ os_setenv(const char *name, const char *value, int overwrite) + /* + * secure_getenv -- provide GNU secure_getenv for FreeBSD + */ +-#ifndef __USE_GNU ++#if defined(__FreeBSD__) + static char * + secure_getenv(const char *name) + { +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch deleted file mode 100644 index dbe9c45e1..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ac24c78f5aa62ba43bb87b74301b659bcc506f11 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Thu, 18 Jul 2019 15:40:22 +0800 -Subject: [PATCH] Makefile: Don't build the examples - -Signed-off-by: Alistair Francis -Upstream-Status: Inappropriate [disable feature] ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 773ab1387..58912f0ab 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -37,13 +37,13 @@ include $(TOP)/src/common.inc - - TARGETS = libpmem libvmem libpmemblk libpmemlog libpmemobj libpmempool\ - libvmmalloc tools --ALL_TARGETS = $(TARGETS) common librpmem examples benchmarks -+ALL_TARGETS = $(TARGETS) common librpmem benchmarks - - SCOPE_DIRS = $(TARGETS) common librpmem rpmem_common - - DEBUG_RELEASE_TARGETS = common libpmem libvmem libpmemblk libpmemlog libpmemobj\ - libpmempool libvmmalloc librpmem --RELEASE_TARGETS = tools examples benchmarks -+RELEASE_TARGETS = tools benchmarks - - CLEAN_NO_JE_TARGETS = $(ALL_TARGETS) rpmem_common test - CLEAN_TARGETS = $(CLEAN_NO_JE_TARGETS) jemalloc --- -2.14.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.6.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.6.bb deleted file mode 100644 index c8688b2c6..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.6.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Persistent Memory Development Kit" -DESCRIPTION = "Persistent Memory Development Kit" -HOMEPAGE = "http://pmem.io" -SECTION = "libs" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7db1106255a1baa80391fd2e21eebab7" -DEPENDS = "ndctl" - -# Required to have the fts.h header for musl -DEPENDS_append_libc-musl = " fts" - -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/pmem/pmdk.git \ - file://0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch \ - file://0002-Makefile-Don-t-install-the-docs.patch \ - file://0003-Makefile-Don-t-build-the-examples.patch \ - " - -SRCREV = "695e6eba28c53a69a0ef7bad3cc0f45c21ef3e00" - -inherit autotools-brokensep pkgconfig - -# Fix jemalloc error: -# | configure: error: cannot run C compiled programs. -# | If you meant to cross compile, use `--host'. -# -# Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" - -# Fix the missing fts libs when using musl -EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" - -do_install() { - oe_runmake prefix=${prefix} DESTDIR=${D} install - - # Remove uneeded files - rm -rf ${D}/usr/${baselib}/pmdk_debug -} - -# Include these by default otherwise the SDK is not very useful -FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" -FILES_${PN} += "${libdir}/*so*" -FILES_${PN} += "${libdir}/pkgconfig/*.pc" -FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" -FILES_${PN} += "/usr/etc" -FILES_${PN} += "/usr/share" - -COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb new file mode 100644 index 000000000..96da266e6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb @@ -0,0 +1,49 @@ +SUMMARY = "Persistent Memory Development Kit" +DESCRIPTION = "Persistent Memory Development Kit" +HOMEPAGE = "http://pmem.io" +SECTION = "libs" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7db1106255a1baa80391fd2e21eebab7" +DEPENDS = "ndctl" + +# Required to have the fts.h header for musl +DEPENDS_append_libc-musl = " fts" + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/pmem/pmdk.git \ + file://0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch \ + file://0002-Makefile-Don-t-install-the-docs.patch \ + file://0001-os_posix-Use-__FreeBSD__-to-control-secure_getenv-de.patch \ + " + +SRCREV = "bc5e309485df61c452d08367e4b13ba9dfed5071" + +inherit autotools-brokensep pkgconfig + +# Fix jemalloc error: +# | configure: error: cannot run C compiled programs. +# | If you meant to cross compile, use `--host'. +# +# Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] +EXTRA_OEMAKE = "BUILD_EXAMPLES='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" + +# Fix the missing fts libs when using musl +EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" + +do_install() { + oe_runmake prefix=${prefix} DESTDIR=${D} install + + # Remove uneeded files + rm -rf ${D}/usr/${baselib}/pmdk_debug +} + +# Include these by default otherwise the SDK is not very useful +FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" +FILES_${PN} += "${libdir}/*so*" +FILES_${PN} += "${libdir}/pkgconfig/*.pc" +FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" +FILES_${PN} += "/usr/etc" +FILES_${PN} += "/usr/share" + +COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/dev-zram0.swap b/meta-openembedded/meta-oe/recipes-extended/zram/zram/dev-zram0.swap new file mode 100644 index 000000000..05eae7eed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/dev-zram0.swap @@ -0,0 +1,10 @@ +[Unit] +Description=Enable compressed swap in memory using zram +Requires=zram-swap.service +After=zram-swap.service + +[Swap] +What=/dev/zram0 + +[Install] +WantedBy=swap.target diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-deinit b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-deinit new file mode 100755 index 000000000..46248c401 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-deinit @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +device=$1 +if [ "$device" = "" ]; then + echo "Usage: zram-swap-deinit " + exit 1 +fi + +sysblockdev=/sys/block/$(basename $device) +if [ ! -d $sysblockdev ]; then + echo "Block device not found in sysfs" + exit 1 +fi + +# zramctl -r is not suitable as it also removes the actual device. Recreating +# it is non-trivial, especially if not /dev/zram0 is used... +echo 1 > ${sysblockdev}/reset + diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init new file mode 100755 index 000000000..0643dbca2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init @@ -0,0 +1,26 @@ +#!/bin/sh +set -e + +device=$1 +if [ "$device" = "" ]; then + echo "Usage: zram-swap-init " + exit 1 +fi + +# Allocate zram to be size of actual system memory +# Note: zram is only allocated when used. When swapped pages compress with a +# a 2:1 ratio zram will require 50% of system memory (while allowing to use +# 150% memory). +ZRAM_SIZE_PERCENT=100 +ZRAM_ALGORITHM=lz4 + +[ -f /etc/default/zram ] && ./etc/default/zram || true + +memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ') +memzram=$(($memtotal*${ZRAM_SIZE_PERCENT}/100)) + +# Try loading zram module +modprobe -q zram || true + +zramctl -a ${ZRAM_ALGORITHM} -s ${memzram}KB $device +mkswap -L "zram-swap" $device diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap.service b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap.service new file mode 100644 index 000000000..a4dc9514e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap.service @@ -0,0 +1,10 @@ +[Unit] +Description=Create compressed swap in memory using zram +DefaultDependencies=no + +[Service] +Type=oneshot +RemainAfterExit=yes +TimeoutStartSec=30sec +ExecStart=@LIBEXECDIR@/zram-swap-init /dev/zram0 +ExecStop=@LIBEXECDIR@/zram-swap-deinit /dev/zram0 diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service deleted file mode 100644 index 4a19367d9..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Enable zram compressed in-memory swap. -After=multi-user.target - -[Service] -RemainAfterExit=yes -ExecStart=/usr/bin/zram-load.sh --load -ExecStop=/usr/bin/zram-load.sh --unload -Type=oneshot - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zramstop b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zramstop new file mode 100644 index 000000000..07777978e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zramstop @@ -0,0 +1,5 @@ +#!/bin/sh + +for i in $(grep '^/dev/zram' /proc/swaps | awk '{ print $1 }'); do + swapoff "$i" && zramctl --reset "$i" +done diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb deleted file mode 100644 index dfd75e71c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Linux zram compressed in-memory swap" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit update-rc.d systemd - -RDEPENDS_${PN} = "util-linux-swaponoff kmod" -RRECOMMENDS_${PN} = "kernel-module-zram" - -PR = "r3" - -SRC_URI = " \ - file://init \ - file://zram.service \ -" - -do_install () { - # Sysvinit - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system -} - -FILES_${PN} = "${sysconfdir}" -INITSCRIPT_NAME = "zram" -INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ." - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "zram.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb new file mode 100644 index 000000000..98c47af7a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb @@ -0,0 +1,50 @@ +SUMMARY = "Linux zram compressed in-memory swap" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit update-rc.d systemd + +RDEPENDS_${PN} = "kmod \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','util-linux','util-linux-swaponoff',d)}" +RRECOMMENDS_${PN} = "kernel-module-zram" + +PR = "r3" + +SRC_URI = " \ + file://init \ + file://zram-swap-init \ + file://zram-swap-deinit \ + file://zram-swap.service \ + file://dev-zram0.swap \ +" + +do_install () { + # Install systemd related configuration file + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${libexecdir} + install -m 0755 ${WORKDIR}/zram-swap-init ${D}${libexecdir} + install -m 0755 ${WORKDIR}/zram-swap-deinit ${D}${libexecdir} + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service + sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/zram-swap.service + install -m 0644 ${WORKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap + fi +} + +FILES_${PN} = " \ + ${sysconfdir} \ + ${systemd_unitdir} \ + ${libexecdir} \ +" +INITSCRIPT_NAME = "zram" +INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ." + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "dev-zram0.swap" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb index 45e3f7b59..ae9704050 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb @@ -1,5 +1,5 @@ SUMMARY = "Xorg 100 DPI font set" -LICENSE = "Custom" +LICENSE = "MIT" inherit packagegroup distro_features_check # rdepends on font recipes with this restriction diff --git a/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb b/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb index dc52c9ff4..19b94466b 100644 --- a/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://sourceforge.net/projects/log4cpp/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -RC = "rc5" -SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}${RC}.tar.gz \ +PRC = "rc5" +SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}${PRC}.tar.gz \ file://fix-pc.patch;striplevel=2 \ " SRC_URI[md5sum] = "58b4591a2f3e7ef3d5e3e7cfb3a81a62" diff --git a/meta-openembedded/meta-perl/conf/layer.conf b/meta-openembedded/meta-perl/conf/layer.conf index 6e600aa67..2c730e4c7 100644 --- a/meta-openembedded/meta-perl/conf/layer.conf +++ b/meta-openembedded/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "thud warrior" +LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus" diff --git a/meta-openembedded/meta-python/conf/layer.conf b/meta-openembedded/meta-python/conf/layer.conf index fb5cda55d..db65943f5 100644 --- a/meta-openembedded/meta-python/conf/layer.conf +++ b/meta-openembedded/meta-python/conf/layer.conf @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "thud warrior" +LAYERSERIES_COMPAT_meta-python = "thud warrior zeus" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf index 0d694789f..6157d4d30 100644 --- a/meta-openembedded/meta-webserver/conf/layer.conf +++ b/meta-openembedded/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "thud warrior" +LAYERSERIES_COMPAT_webserver = "thud warrior zeus" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf index da07f8e16..070ea6ac7 100644 --- a/meta-openembedded/meta-xfce/conf/layer.conf +++ b/meta-openembedded/meta-xfce/conf/layer.conf @@ -19,4 +19,4 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "thud warrior" +LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus" -- cgit v1.2.3