diff options
Diffstat (limited to 'meta-openembedded')
118 files changed, 986 insertions, 525 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb index 251f03b07..60b664ff5 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/libfuse/sshfs" SRCREV = "9700b353700589dcc462205c638bcb40219a49c2" S = "${WORKDIR}/git" -inherit meson ptest +inherit meson pkgconfig ptest SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb b/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb index 1e88ced90..3591a4f6d 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb @@ -11,7 +11,7 @@ RDEPENDS:${PN} = "udev bash" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit autotools systemd +inherit autotools pkgconfig systemd SRC_URI = "https://github.com/IgnorantGuru/udevil/raw/pkg/${PV}/udevil-${PV}.tar.xz \ file://0001-udevil-0.4.3-fix-compile-with-gcc6.patch \ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb index 64873ac03..df5f764e1 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb @@ -13,7 +13,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://0001-support-usrmerge.patch \ " SRC_URI[sha256sum] = "4e142d4babe086adf9016d8c606c805829da08e46389a4433f40346204f90cdb" -inherit autotools-brokensep +inherit autotools-brokensep pkgconfig PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb index e123ef5fc..d509aa3dd 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -10,7 +10,7 @@ DEPENDS = " \ json-c \ " -inherit autotools gobject-introspection gettext python3native +inherit autotools gobject-introspection gettext pkgconfig python3native SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1 \ file://0001-make-build-compatible-w.-autoconf-2.7.patch \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb index 74e2bd677..e4c590e48 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb @@ -10,7 +10,7 @@ DEPENDS = " \ libpam \ " -REQUIRED_DISTRO_FEATURES = "x11 systemd pam" +REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit" inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb index 24312c78a..9b99bbc4e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" -inherit features_check gobject-introspection meson +inherit features_check gobject-introspection meson pkgconfig REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb index 11d144278..3488fb568 100644 --- a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb +++ b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb @@ -17,7 +17,7 @@ DEPENDS = " \ libstemmer \ " -inherit meson gobject-introspection gettext bash-completion +inherit meson gobject-introspection gettext bash-completion pkgconfig SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" SRC_URI[sha256sum] = "ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002" diff --git a/meta-openembedded/meta-gnome/site/arm-64 b/meta-openembedded/meta-gnome/site/arm-64 deleted file mode 100644 index f474d2cc4..000000000 --- a/meta-openembedded/meta-gnome/site/arm-64 +++ /dev/null @@ -1,13 +0,0 @@ -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=8 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=8 -ac_cv_alignof_CORBA_long_long=8 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=1 -ac_cv_alignof_CORBA_wchar=2 diff --git a/meta-openembedded/meta-gnome/site/riscv64-linux b/meta-openembedded/meta-gnome/site/riscv64-linux deleted file mode 100644 index e3a41ea0e..000000000 --- a/meta-openembedded/meta-gnome/site/riscv64-linux +++ /dev/null @@ -1,16 +0,0 @@ -# libidl -libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} - -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=8 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=8 -ac_cv_alignof_CORBA_long_long=8 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=1 -ac_cv_alignof_CORBA_wchar=2 diff --git a/meta-openembedded/meta-gnome/site/x86_64-linux b/meta-openembedded/meta-gnome/site/x86_64-linux deleted file mode 100644 index eba1fee2b..000000000 --- a/meta-openembedded/meta-gnome/site/x86_64-linux +++ /dev/null @@ -1,17 +0,0 @@ -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=8 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=8 -ac_cv_alignof_CORBA_long_long=8 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=8 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=1 -ac_cv_alignof_CORBA_wchar=2 - -lf_cv_sane_realloc=yes -as_cv_unaligned_access=${as_cv_unaligned_access=yes} - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb index 045746aa6..f7d9c7637 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb @@ -15,7 +15,7 @@ DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fspr SYSTEMD_SERVICE:${PN} = "gerbera.service" -inherit cmake systemd +inherit cmake pkgconfig systemd PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb index fe4bd3744..baf75aa51 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb @@ -32,4 +32,4 @@ FILES:${PN} += "\ ${libdir}/gstreamer-1.0/libgstsharktracers.la \ " -inherit autotools gettext +inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb index 4d301fb2f..b34479f38 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb @@ -11,4 +11,4 @@ PV = "v0.0.6+git${SRCPV}" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb index f4e26d52c..412a272ee 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb @@ -25,7 +25,7 @@ SRC_URI = "git://github.com/MycroftAI/mimic1.git \ file://0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch \ " -inherit autotools +inherit autotools pkgconfig S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb index dcfc3df0b..32ec15def 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" HOMEPAGE = "https://www.musicpd.org/clients/mpc/" -inherit meson +inherit meson pkgconfig DEPENDS += "libmpdclient" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb index b81129709..aa1a234a6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" -inherit meson +inherit meson pkgconfig DEPENDS += " \ boost \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb b/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb index 125dfaaa9..3dc304b23 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb @@ -1,8 +1,10 @@ DESCRIPTION = "autossh is a program to start a copy of ssh and monitor it, restarting it as necessary should it die or stop passing traffic" HOMEPAGE = "https://www.harding.motd.ca/autossh/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://autossh.spec;md5=80a6701134723fd3420e733b46a0eb97" +LICENSE = "BSD-1-Clause & BSD-4-Clause" +LIC_FILES_CHKSUM = "file://autossh.spec;md5=80a6701134723fd3420e733b46a0eb97 \ + file://autossh.c;md5=76c37acd40ac45050a4ced145b1e2707;startline=7;endline=23 \ + file://daemon.h;md5=6bbeaac616b9bc8de7b40049004f4289;startline=7;endline=39" SRC_URI = "https://www.harding.motd.ca/autossh/${BP}.tgz" SRC_URI[md5sum] = "2b804bc1bf6d2f2afaa526d02df7c0a2" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb index 6ccb425e3..8e874edd5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" -inherit autotools gettext systemd gsettings python3native gtk-icon-cache +inherit autotools gettext systemd gsettings pkgconfig python3native gtk-icon-cache SRC_URI = " \ https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb index 7b663cdbb..f99dfd66f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -19,7 +19,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" -inherit python3-dir python3native siteinfo +inherit pkgconfig python3-dir python3native siteinfo # Recursive make problem EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg' \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb index 7aed5105c..7d29bf1ed 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "52c5e3d5b1e2efc0e86c22b2bc1f7fd80908cc2d8130157dc2a3517a59 # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 DEPENDS = "intltool-native glib-2.0-native nftables" -inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d +inherit gettext autotools bash-completion pkgconfig python3native gsettings systemd update-rc.d PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb index 2df400846..d2fa9cf32 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb @@ -21,7 +21,7 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ SRC_URI[sha256sum] = "31cf0065cb431d6f4e57a5f4d56663e839c9d177362eff89582d7cfde191c933" -inherit systemd update-rc.d useradd cmake +inherit systemd update-rc.d useradd cmake pkgconfig PACKAGECONFIG ??= "ssl dlt websockets \ ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.7.bb index 2bc43e714..47fcd3a00 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.7.bb @@ -34,12 +34,12 @@ SRC_URI:append:libc-musl = " \ file://samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[md5sum] = "96d275e31387e6c403d6c16465d15b7e" -SRC_URI[sha256sum] = "bb6ef5d2f16b85288d823578abc453d9a80514c42e5a2ea2c4e3c60dc42335c3" +SRC_URI[md5sum] = "f0db8302944bb861b31f4163fd302f66" +SRC_URI[sha256sum] = "6f50353f9602aa20245eb18ceb00e7e5ec793df0974aebd5254c38f16d8f1906" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz" -inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version +inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig # CVE-2011-2411 is valnerble only on HP NonStop Servers. CVE_CHECK_WHITELIST += "CVE-2011-2411" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc index 7bf258374..8a4428c50 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc @@ -6,7 +6,7 @@ has a definite Sendmail-ish flavor, but the inside is completely different." HOMEPAGE= "http://www.postfix.org" SECTION = "mail" -DEPENDS = "db icu libpcre libnsl2 openssl postfix-native \ +DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ " @@ -20,7 +20,7 @@ CLEANBROKEN = "1" BBCLASSEXTEND = "native" -inherit update-rc.d useradd update-alternatives systemd lib_package +inherit pkgconfig update-rc.d useradd update-alternatives systemd lib_package INITSCRIPT_NAME = "postfix" INITSCRIPT_PARAMS = "start 58 3 4 5 . stop 13 0 1 6 ." diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb index edbca246d..b19482c79 100644 --- a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb +++ b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" -inherit autotools +inherit autotools pkgconfig S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb index e6ea2ddae..e5a28de40 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb @@ -151,6 +151,10 @@ do_install:append() { -i ${D}${bindir}/net-snmp-config oe_multilib_header net-snmp/net-snmp-config.h + + if [ "${HAS_PERL}" = "1" ]; then + find ${D}${libdir}/ -type f -name "perllocal.pod" | xargs rm -f + fi } do_install_ptest() { diff --git a/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb index 344aa33de..363eeeb56 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb @@ -26,6 +26,8 @@ SRC_URI[sha256sum] = "8cd6bc71ba46bd5f6eb4daf60220ccdcd991a8525111dee466501b1b97 inherit autotools-brokensep update-rc.d systemd +CACHED_CONFIGUREVARS += "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', 'rpppoe_cv_pack_bitfields=normal', 'rpppoe_cv_pack_bitfields=rev', d)}" + do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.21.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.21.bb index 33a05ed61..892e02844 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.21.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.21.bb @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ " SRC_URI[sha256sum] = "6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d" -inherit autotools gettext python3-dir python3native +inherit autotools gettext pkgconfig python3-dir python3native EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb index 719353058..f1b8cd606 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada SRC_URI[md5sum] = "fe4b1f17f77e2ea52b4e1320d927844c" SRC_URI[sha256sum] = "a4d308b3d0922ef01f3661a69ebc373e772374defa76cf0979ad21b21f91922d" -inherit waf-samba +inherit pkgconfig waf-samba S = "${WORKDIR}/ldb-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb index fa5b4ade8..5d7e1a0d6 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b SRC_URI[md5sum] = "105c7a4dbb96f1751eb27dfd05e7fa84" SRC_URI[sha256sum] = "f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696" -inherit waf-samba +inherit pkgconfig waf-samba PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.44.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.45.1.bb index 6e133ec20..e4a17cbdd 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.44.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.45.1.bb @@ -11,7 +11,7 @@ SRC_URI = "\ https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ file://0001-fetch-ocsp-response-use-python3.patch \ " -SRC_URI[sha256sum] = "5699473b29941e8dafed10de5c8cb37a3581edf62ba7d04b911ca247d4de3c5d" +SRC_URI[sha256sum] = "abdc4addccadbc7d89abe27c4d6427d78e57d139f69c1f45749227393c68bf79" inherit cmake manpages python3native PACKAGECONFIG[manpages] = "" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb index 89107430e..0ddc59678 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb @@ -29,7 +29,7 @@ export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" LDFLAGS:append:mipsarch = " -latomic" LDFLAGS:append:powerpc = " -latomic" LDFLAGS:append:riscv32 = " -latomic" -inherit autotools-brokensep gettext systemd +inherit autotools-brokensep gettext pkgconfig systemd do_install:append() { install -d ${D}${systemd_unitdir}/system/ diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_36.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_36.0.bb index 097144d35..bcb6c0e10 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_36.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_36.0.bb @@ -26,7 +26,7 @@ FILES_SOLIBSDEV = "" FILES:${PN} += "${libdir}/*" INSANE_SKIP:${PN} += "dev-so" -inherit cmake cpan-base python3native systemd +inherit cmake cpan-base pkgconfig python3native systemd SYSTEMD_SERVICE:${PN} = " \ srp_daemon.service \ diff --git a/meta-openembedded/meta-networking/site/endian-big b/meta-openembedded/meta-networking/site/endian-big deleted file mode 100644 index 3a968e326..000000000 --- a/meta-openembedded/meta-networking/site/endian-big +++ /dev/null @@ -1,2 +0,0 @@ -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=normal} diff --git a/meta-openembedded/meta-networking/site/endian-little b/meta-openembedded/meta-networking/site/endian-little deleted file mode 100644 index 0bcd966ea..000000000 --- a/meta-openembedded/meta-networking/site/endian-little +++ /dev/null @@ -1,2 +0,0 @@ -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.27.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.28.bb index 96791948b..6e4b648d2 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.27.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.28.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA:armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "0313e938c9c8bb37d71dade239f1f5326677b079" +SRCREV = "d83ac9d3d30d5f5dc6d0e425e4ba945a772839f6" SRC_URI = "git://git.kernel.dk/fio.git \ " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 74902500d..43b000e7d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -18,7 +18,7 @@ PV = "3.00" S = "${WORKDIR}/git" -inherit autotools-brokensep gettext update-rc.d systemd mime-xdg +inherit autotools-brokensep gettext update-rc.d pkgconfig systemd mime-xdg PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 270df6f0e..d234d0185 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "267d300d1c99381a0fbc7e060ae2899e51f5e425" -PV = "4.8.0" +SRCREV = "dd663fafd830466d34cba278c2cfd0f92eb67614" +PV = "4.8.1" SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb index 71ab4d45a..7d0182978 100644 --- a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -13,6 +13,6 @@ SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa" S = "${WORKDIR}/git" -inherit autotools vala +inherit autotools pkgconfig vala EXTRA_OECONF += "--enable-vala" diff --git a/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb index 3c6ffe04e..fb1b18c18 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1 \ file://0001-Makefile-use-libprefix-instead-of-libdir.patch \ " -SRCREV = "LMDB_${PV}" +SRCREV = "8ad7be2510414b9506ec9f9e24f24d04d9b04a1a" inherit base ptest diff --git a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch deleted file mode 100644 index 4c996656c..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 329e27c8ad30e76ab50c7949cc95ba8eb0efabd2 Mon Sep 17 00:00:00 2001 -From: Anton Blanchard <anton@ozlabs.org> -Date: Tue, 17 Aug 2021 09:53:41 +1000 -Subject: [PATCH] Use GNUInstallDirs instead of hard wiring install directories - -On a multilib setup cmake files should go into lib64. - -Upstream-Status: Submitted [https://github.com/CPPAlliance/url/pull/38] ---- - CMakeLists.txt | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b53f31..ebb7346 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -109,20 +109,22 @@ else() - endif() - - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT BOOST_URL_IN_BOOST_TREE) -+ include(GNUInstallDirs) -+ - set_target_properties(boost_url PROPERTIES EXPORT_NAME url) - install(TARGETS boost_url EXPORT boost_url_targets) - - install(EXPORT boost_url_targets - FILE boost_url-targets.cmake - NAMESPACE Boost:: -- DESTINATION lib/cmake/boost_url -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url - ) - - include(CMakePackageConfigHelpers) - - configure_package_config_file(cmake/config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config.cmake -- INSTALL_DESTINATION lib/cmake/boost_url -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url - ) - - write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/boost_url-config-version.cmake -@@ -132,10 +134,10 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT BOOST_URL_IN_BOOST - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config-version.cmake -- DESTINATION lib/cmake/boost_url -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url - ) - -- install(DIRECTORY include/ DESTINATION include) -+ install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - if(BOOST_URL_BUILD_TESTS) --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb index cb3664fe3..9f759100b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb @@ -4,16 +4,17 @@ SECTION = "libs" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop \ - file://0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch \ - " +SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop" -SRCREV = "2c867fbe284ae532f1329b87a86ad3f8cd382867" +SRCREV = "4f712ed69a04a344957d22efa5dc111b415b3aff" S = "${WORKDIR}/git" -inherit cmake - DEPENDS = "boost" BBCLASSEXTEND = "native nativesdk" + +do_install() { + mkdir -p ${D}/${includedir} + cp -r ${S}/include/** ${D}/${includedir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb index d4fed864d..7cd06f102 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb @@ -7,7 +7,7 @@ DESCRIPTION = "jemalloc is a general purpose malloc(3) implementation that empha fragmentation avoidance and scalable concurrency support." HOMEPAGE = "https://github.com/jemalloc/jemalloc" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" SECTION = "libs" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb index 7dbefa115..76d1c8bf3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -24,7 +24,7 @@ PV = "1.0.1+git${SRCPV}" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig DEPENDS = "json-c" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch new file mode 100644 index 000000000..54cd096e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch @@ -0,0 +1,35 @@ +From 436163ab845c263312cf3d4717a43727cf5f0747 Mon Sep 17 00:00:00 2001 +From: Matteo Croce <mcroce@microsoft.com> +Date: Wed, 15 Sep 2021 17:54:01 +0200 +Subject: [PATCH] Use /usr/bin/env python3 instead of just /usr/bin/python3 + +Upstream-Status: inappropriate [OE specific] + +--- + ostra/ostra-cg | 2 +- + ostra/python/ostra.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ostra/ostra-cg b/ostra/ostra-cg +index 52c902e..8142e67 100755 +--- a/ostra/ostra-cg ++++ b/ostra/ostra-cg +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # ostra-cg - generate callgraphs from encoded trace + # + # Arnaldo Carvalho de Melo <acme@redhat.com> +diff --git a/ostra/python/ostra.py b/ostra/python/ostra.py +index 86fe079..9bb5ad1 100755 +--- a/ostra/python/ostra.py ++++ b/ostra/python/ostra.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # + # Copyright (C) 2005, 2006, 2007 Arnaldo Carvalho de Melo + # +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb index db7d88cdf..0fdde93e0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb @@ -9,11 +9,12 @@ COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f" SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git \ - file://0001-CMakeList.txt-make-python-optional.patch" + file://0001-CMakeList.txt-make-python-optional.patch \ + file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig PACKAGECONFIG[python3] = ",,python3-core,python3-core" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch index fc7286122..bd3a277a3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch @@ -1,7 +1,8 @@ -From 321709837f412e2f590e36e3fe33571bb40036a7 Mon Sep 17 00:00:00 2001 +From 8515ceec5ba3e2fcdbc819b5bf10fe742d7c9d5d Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Thu, 27 Jun 2019 13:27:18 +0000 -Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building libprotoc.so +Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building + libprotoc.so * otherwise plugin.pb.o has undefined symbol scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto and build with gold fails with: @@ -10,19 +11,20 @@ Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building libprotoc.s Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am -index be18ba761..57e3daec1 100644 +index d4f11ce79..96d911746 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -313,6 +313,7 @@ libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map +@@ -323,6 +323,7 @@ libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map endif libprotoc_la_SOURCES = \ + google/protobuf/descriptor.pb.cc \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ - google/protobuf/compiler/plugin.cc \ + google/protobuf/compiler/cpp/cpp_enum.cc \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.18.0.bb index 4de2c93d4..9f501124a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.18.0.bb @@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "909a0f36a10075c4b4bc70fdee2c7e32dd612a72" +SRCREV = "89b14b1d16eba4d44af43256fc45b24a6a348557" -SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ +SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=3.18.x \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ -" + " S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig ptest diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 5dcc6afdf..8365da0f9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -18,16 +18,19 @@ Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Update for 20200910. Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> + +Update for 20210808. +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- aclocal.m4 | 1 - configure | 259 ----------------------------------------------------- 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 1c6a3ee..2f7e9b5 100644 +index 7a9a8fb..108b6cc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1317,7 +1317,6 @@ CF_GCC_VERSION +@@ -1401,7 +1401,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -36,20 +39,20 @@ index 1c6a3ee..2f7e9b5 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index 378f27d..8f40229 100755 +index 5b98a03..e3a4237 100755 --- a/configure +++ b/configure -@@ -2066,265 +2066,6 @@ esac +@@ -2146,265 +2146,6 @@ esac # This should have been defined by AC_PROG_CC - : ${CC:=cc} + : "${CC:=cc}" --echo "$as_me:2069: checking \$CFLAGS variable" >&5 +-echo "$as_me:2149: checking \$CFLAGS variable" >&5 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 -case "x$CFLAGS" in -(*-[IUD]*) -- echo "$as_me:2073: result: broken" >&5 +- echo "$as_me:2153: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2075: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +- { echo "$as_me:2155: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} - cf_flags="$CFLAGS" - CFLAGS= @@ -63,19 +66,19 @@ index 378f27d..8f40229 100755 - -for cf_add_cflags in $cf_arg -do --case $cf_fix_cppflags in +-case "$cf_fix_cppflags" in -(no) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - -- if test $cf_fix_cppflags = yes ; then +- if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -94,7 +97,7 @@ index 378f27d..8f40229 100755 - (*$cf_add_cflags) - ;; - (*) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - @@ -124,7 +127,7 @@ index 378f27d..8f40229 100755 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ @@ -157,18 +160,18 @@ index 378f27d..8f40229 100755 - done - ;; -(*) -- echo "$as_me:2183: result: ok" >&5 +- echo "$as_me:2263: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - --echo "$as_me:2188: checking \$CC variable" >&5 +-echo "$as_me:2268: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:2192: result: broken" >&5 +- echo "$as_me:2272: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2194: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +- { echo "$as_me:2274: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -186,19 +189,19 @@ index 378f27d..8f40229 100755 - -for cf_add_cflags in $cf_arg -do --case $cf_fix_cppflags in +-case "$cf_fix_cppflags" in -(no) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - -- if test $cf_fix_cppflags = yes ; then +- if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -217,7 +220,7 @@ index 378f27d..8f40229 100755 - (*$cf_add_cflags) - ;; - (*) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - @@ -247,7 +250,7 @@ index 378f27d..8f40229 100755 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ @@ -285,24 +288,24 @@ index 378f27d..8f40229 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2391: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2395: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2399: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2323: result: ok" >&5 +- echo "$as_me:2403: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2328: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2408: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb index b7640ffca..eeed39f63 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb @@ -4,8 +4,7 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=262857ec5923f073fa06a1f1812225ea" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=80ce98c6ab91cc4a93a9d2cfb7c14463" require byacc.inc -SRC_URI[md5sum] = "5726a5a655c6fd4e8f950552cceeae29" -SRC_URI[sha256sum] = "0a5906073aeaf23ddc20aaac0ea61cb5ccc18572870b113375dec4ffe85ecf30" +SRC_URI[sha256sum] = "f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index 94df01506..6b906a21c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -43,7 +43,7 @@ PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt- PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" -inherit autotools gettext cmake systemd +inherit autotools gettext cmake pkgconfig systemd EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb index 14168e6bb..7325b26e3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb @@ -8,7 +8,7 @@ SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" -inherit autotools gobject-introspection +inherit autotools gobject-introspection pkgconfig SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64" diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index a1919e740..e96138ea8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -15,7 +15,7 @@ SRC_URI = "\ S = "${WORKDIR}/git" -inherit cpan autotools-brokensep gettext python3native python3-dir systemd +inherit cpan autotools-brokensep gettext pkgconfig python3native python3-dir systemd BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index bfecc7ebd..ef1ae2c0b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd SRCNAME = "volume_key" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools python3native gettext +inherit autotools python3native gettext pkgconfig DEPENDS += " \ util-linux \ diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb index f1e87ba22..9d9fab2ea 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb @@ -10,7 +10,7 @@ LICENSE = "wxWidgets" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)} -inherit features_check lib_package binconfig +inherit features_check lib_package binconfig pkgconfig # All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb index 62d4cba5f..be5b6013f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb @@ -15,7 +15,7 @@ DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native" RDEPENDS:${PN} = "libxcb xcb-util-keysyms" -inherit cmake python3native features_check +inherit cmake pkgconfig python3native features_check REQUIRED_DISTRO_FEATURES = "x11 opengl" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index 057a1772a..e7673c58d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" S = "${WORKDIR}/git" -inherit features_check +inherit autotools cmake features_check pkgconfig + REQUIRED_DISTRO_FEATURES = "x11 pam" -inherit autotools cmake B = "${S}" SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb index ec2d10608..64dd3ea78 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb @@ -10,7 +10,7 @@ SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" S = "${WORKDIR}/git" -inherit features_check meson +inherit features_check meson pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch new file mode 100644 index 000000000..cb396c37d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch @@ -0,0 +1,126 @@ +From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 +From: Trevor Woerner <twoerner@gmail.com> +Date: Thu, 23 Sep 2021 19:36:43 -0400 +Subject: [PATCH] use library sonames for linking + +The recommended "best practices" for applications is to link to library +sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This +ensures that applications don't try to use libraries if an incompatible ABI +change occurs. + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] +Signed-off-by: Trevor Woerner <twoerner@gmail.com> +--- + framework/egl/egluGLContextFactory.cpp | 4 ++-- + framework/egl/wrapper/eglwLibrary.cpp | 2 +- + framework/platform/android/tcuAndroidPlatform.cpp | 2 +- + framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- + .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- + framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- + 6 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/framework/egl/egluGLContextFactory.cpp b/framework/egl/egluGLContextFactory.cpp +index 8fbea2af1..8d42f19eb 100644 +--- a/framework/egl/egluGLContextFactory.cpp ++++ b/framework/egl/egluGLContextFactory.cpp +@@ -63,7 +63,7 @@ using std::vector; + # if (DE_OS == DE_OS_WIN32) + # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" + # else +-# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + # endif + #endif + +@@ -75,7 +75,7 @@ using std::vector; + # if (DE_OS == DE_OS_WIN32) + # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" + # else +-# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + # endif + #endif + +diff --git a/framework/egl/wrapper/eglwLibrary.cpp b/framework/egl/wrapper/eglwLibrary.cpp +index d7e07fe18..ebdf68b14 100644 +--- a/framework/egl/wrapper/eglwLibrary.cpp ++++ b/framework/egl/wrapper/eglwLibrary.cpp +@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) + const char* DefaultLibrary::getLibraryFileName (void) + { + #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) +- return "libEGL.so"; ++ return "libEGL.so.1"; + #elif (DE_OS == DE_OS_WIN32) + return "libEGL.dll"; + #else +diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp +index b9a4c716f..05cec0b49 100644 +--- a/framework/platform/android/tcuAndroidPlatform.cpp ++++ b/framework/platform/android/tcuAndroidPlatform.cpp +@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capability WINDOW_CAPABILITIES = (eglu::Nativ + class NativeDisplay : public eglu::NativeDisplay + { + public: +- NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} ++ NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} + virtual ~NativeDisplay (void) {} + + virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } +diff --git a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +index 009c05e18..237c5e16f 100644 +--- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp ++++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibrary + { + public: + Library (void) +- : eglw::DefaultLibrary("libEGL.so") ++ : eglw::DefaultLibrary("libEGL.so.1") + { + } + +diff --git a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp +index 97bc3a0ed..3a20d63d3 100644 +--- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp ++++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp +@@ -66,7 +66,7 @@ public: + EGL_PLATFORM_WAYLAND_KHR, + "EGL_KHR_platform_wayland") + , m_display (waylandDisplay) +- , m_library ("libEGL.so") {} ++ , m_library ("libEGL.so.1") {} + + ~Display(void) {} + wayland::Display& getWaylandDisplay (void) { return *m_display; } +diff --git a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp +index 9783eaeab..a1d8ac667 100644 +--- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp ++++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp +@@ -69,7 +69,7 @@ using std::vector; + + // Default library names + #if !defined(DEQP_GLES2_LIBRARY_PATH) +-# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + #endif + + #if !defined(DEQP_GLES3_LIBRARY_PATH) +@@ -77,7 +77,7 @@ using std::vector; + #endif + + #if !defined(DEQP_OPENGL_LIBRARY_PATH) +-# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + #endif + + namespace tcu +@@ -238,7 +238,7 @@ glu::RenderContext* ContextFactory::createContext(const glu::RenderConfig& confi + } + + EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine) +- : m_egl("libEGL.so") ++ : m_egl("libEGL.so.1") + , m_contextType(config.type) + , m_eglDisplay(EGL_NO_DISPLAY) + , m_eglContext(EGL_NO_CONTEXT) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index f61921473..1faee4d3a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -18,13 +18,14 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake features_check -REQUIRED_DISTRO_FEATURES += "opengl" +ANY_OF_DISTRO_FEATURES += "opengl wayland" -DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" +DEPENDS += "libpng zlib virtual/libgles2" SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ file://0001-vulkancts.patch \ + file://0001-use-library-sonames-for-linking.patch \ " SRC_URI:append:libc-musl = "\ @@ -36,7 +37,30 @@ SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " -EXTRA_OECMAKE:append = " -DDEQP_TARGET=surfaceless" +# The best thing for the user to do is to not specify any of the following +# PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own +# probing and build what it thinks is appropriate. +# However, if you want, you can specify one of the following PACKAGECONFIGs +# to override this behaviour. +PACKAGECONFIG ??= "" +PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,,,,,wayland x11_egl x11_glx x11_egl_glx" +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland,,,surfaceless x11_egl x11_glx x11_egl_glx" +PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_glx x11_egl_glx" +PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx" +PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx" + +python __anonymous() { + # if the user doesn't specify any PACKAGECONFIG then the cts build system + # is going to probe the sysroot to try to figure out what to build + # in this case we try to guess whether the user is building for wayland + # or x11 and add the required dependencies automatically + distrofeatures = (d.getVar("DISTRO_FEATURES") or "") + if not bb.utils.contains_any("PACKAGECONFIG", ["surfaceless", "wayland", "x11_egl", "x11_glx", "x11_egl_glx"], True, False, d): + if "wayland" in distrofeatures: + d.appendVar("DEPENDS", " wayland ") + if "x11" in distrofeatures: + d.appendVar("DEPENDS", " virtual/libx11 virtual/egl ") +} CTSDIR = "/usr/lib/${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb b/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb index 46ce67131..6ede557c7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/yad/yad_6.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "git://github.com/v1cont/yad.git" SRCREV = "a5b1a7a3867bc7dffbbc539f586f301687b6ec02" -inherit autotools gsettings features_check +inherit autotools gsettings features_check pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 3e98e71c6..591703e86 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" # mind when doing version upgrades). DEPENDS = "libxml-parser-perl-native intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" -inherit autotools features_check perlnative +inherit autotools features_check perlnative pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb index d2058ba57..8d74eb4a2 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Machine specific gpsd config" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" # empty by default diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb index b86bfead7..98f464fd0 100644 --- a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb @@ -14,4 +14,4 @@ SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ S = "${WORKDIR}/git/lang/c" -inherit cmake +inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb index 0511f4a30..a1076ccf9 100644 --- a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb @@ -21,4 +21,4 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-unixadmin" +RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb index a91c465c1..193cd0012 100644 --- a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb @@ -24,8 +24,7 @@ EXTRA_OECONF = " --with-x=no --with-dumping=none" DEPENDS = "ncurses" DEPENDS:append:class-target = " emacs-native" -inherit autotools mime-xdg - +inherit autotools mime-xdg pkgconfig do_compile:class-native (){ cd ${B}/lib-src diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch deleted file mode 100644 index 6152a1184..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001 -From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu> -Date: Mon, 19 Jul 2021 10:07:13 +0430 -Subject: [PATCH] fix read out-of-bands in reading tga header file - ---- - src/gd_tga.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/gd_tga.c b/src/gd_tga.c -index cae9428..286febb 100644 ---- a/src/gd_tga.c -+++ b/src/gd_tga.c -@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) - return -1; - } - -- gdGetBuf(tga->ident, tga->identsize, ctx); -+ -+ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) { -+ gd_error("fail to read header ident"); -+ return -1; -+ } - } - - return 1; --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch deleted file mode 100644 index faf349b0b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 4ae9904a10f61ed60f4d4ee02eb1994a95664d7b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 22 Apr 2021 22:48:59 -0700 -Subject: [PATCH] replace uint32 with uint32_t and uint16 with uint16_6 - -uint16 and uint32 are now deprecated in libtiff and suggestion is to use -standard C99 types - -Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/694] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/gd_tiff.c | 52 +++++++++++++++++++++++++-------------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -diff --git a/src/gd_tiff.c b/src/gd_tiff.c -index b22ee6c..699d719 100644 ---- a/src/gd_tiff.c -+++ b/src/gd_tiff.c -@@ -237,10 +237,10 @@ void tiffWriter(gdImagePtr image, gdIOCtx *out, int bitDepth) - int transparentColorR = -1; - int transparentColorG = -1; - int transparentColorB = -1; -- uint16 extraSamples[1]; -- uint16 *colorMapRed = NULL; -- uint16 *colorMapGreen = NULL; -- uint16 *colorMapBlue = NULL; -+ uint16_t extraSamples[1]; -+ uint16_t *colorMapRed = NULL; -+ uint16_t *colorMapGreen = NULL; -+ uint16_t *colorMapBlue = NULL; - - tiff_handle *th; - -@@ -292,18 +292,18 @@ void tiffWriter(gdImagePtr image, gdIOCtx *out, int bitDepth) - - /* build the color map for 8 bit images */ - if(bitDepth != 24) { -- colorMapRed = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); -+ colorMapRed = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); - if (!colorMapRed) { - gdFree(th); - return; - } -- colorMapGreen = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); -+ colorMapGreen = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); - if (!colorMapGreen) { - gdFree(colorMapRed); - gdFree(th); - return; - } -- colorMapBlue = (uint16 *) gdMalloc(3 * (1 << bitsPerSample)); -+ colorMapBlue = (uint16_t *) gdMalloc(3 * (1 << bitsPerSample)); - if (!colorMapBlue) { - gdFree(colorMapRed); - gdFree(colorMapGreen); -@@ -448,7 +448,7 @@ BGD_DECLARE(void) gdImageTiffCtx(gdImagePtr image, gdIOCtx *out) - /* Check if we are really in 8bit mode */ - static int checkColorMap(n, r, g, b) - int n; --uint16 *r, *g, *b; -+uint16_t *r, *g, *b; - { - while (n-- > 0) - if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256) -@@ -460,8 +460,8 @@ uint16 *r, *g, *b; - /* Read and convert a TIFF colormap */ - static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometric) - { -- uint16 *redcmap, *greencmap, *bluecmap; -- uint16 bps; -+ uint16_t *redcmap, *greencmap, *bluecmap; -+ uint16_t bps; - int i; - - if (is_bw) { -@@ -473,7 +473,7 @@ static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometri - gdImageColorAllocate(im, 255,255,255); - } - } else { -- uint16 min_sample_val, max_sample_val; -+ uint16_t min_sample_val, max_sample_val; - - if (!TIFFGetField(tif, TIFFTAG_MINSAMPLEVALUE, &min_sample_val)) { - min_sample_val = 0; -@@ -515,7 +515,7 @@ static int readTiffColorMap(gdImagePtr im, TIFF *tif, char is_bw, int photometri - - static void readTiffBw (const unsigned char *src, - gdImagePtr im, -- uint16 photometric, -+ uint16_t photometric, - int startx, - int starty, - int width, -@@ -547,7 +547,7 @@ static void readTiffBw (const unsigned char *src, - - static void readTiff8bit (const unsigned char *src, - gdImagePtr im, -- uint16 photometric, -+ uint16_t photometric, - int startx, - int starty, - int width, -@@ -634,10 +634,10 @@ static void readTiff8bit (const unsigned char *src, - } - } - --static int createFromTiffTiles(TIFF *tif, gdImagePtr im, uint16 bps, uint16 photometric, -+static int createFromTiffTiles(TIFF *tif, gdImagePtr im, uint16_t bps, uint16_t photometric, - char has_alpha, char is_bw, int extra) - { -- uint16 planar; -+ uint16_t planar; - int im_width, im_height; - int tile_width, tile_height; - int x, y, height, width; -@@ -682,11 +682,11 @@ end: - return success; - } - --static int createFromTiffLines(TIFF *tif, gdImagePtr im, uint16 bps, uint16 photometric, -+static int createFromTiffLines(TIFF *tif, gdImagePtr im, uint16_t bps, uint16_t photometric, - char has_alpha, char is_bw, int extra) - { -- uint16 planar; -- uint32 im_height, im_width, y; -+ uint16_t planar; -+ uint32_t im_height, im_width, y; - - unsigned char *buffer; - int success = GD_SUCCESS; -@@ -761,11 +761,11 @@ static int createFromTiffRgba(TIFF * tif, gdImagePtr im) - int color; - int width = im->sx; - int height = im->sy; -- uint32 *buffer; -- uint32 rgba; -+ uint32_t *buffer; -+ uint32_t rgba; - int success; - -- buffer = (uint32 *) gdCalloc(sizeof(uint32), width * height); -+ buffer = (uint32_t *) gdCalloc(sizeof(uint32_t), width * height); - if (!buffer) { - return GD_FAILURE; - } -@@ -810,11 +810,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile) - TIFF *tif; - tiff_handle *th; - -- uint16 bps, spp, photometric; -- uint16 orientation; -+ uint16_t bps, spp, photometric; -+ uint16_t orientation; - int width, height; -- uint16 extra, *extra_types; -- uint16 planar; -+ uint16_t extra, *extra_types; -+ uint16_t planar; - char has_alpha, is_bw, is_gray; - char force_rgba = FALSE; - char save_transparent; -@@ -867,7 +867,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile) - } - - if (!TIFFGetField (tif, TIFFTAG_PHOTOMETRIC, &photometric)) { -- uint16 compression; -+ uint16_t compression; - if (TIFFGetField(tif, TIFFTAG_COMPRESSION, &compression) && - (compression == COMPRESSION_CCITTFAX3 || - compression == COMPRESSION_CCITTFAX4 || diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.3.bb index 32484ce79..cbd45c088 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.3.bb @@ -9,16 +9,14 @@ HOMEPAGE = "http://libgd.github.io/" SECTION = "libs" LICENSE = "GD" -LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" +LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ - file://0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch \ - file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \ +SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1 \ " -SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" +SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb index 118259e4f..7b8d4a3f9 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb @@ -12,7 +12,7 @@ B = "${S}" SRCREV = "c9864f4dd03736839f40d225da494cb1eb64e654" SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" -inherit gettext autotools python3native +inherit gettext autotools pkgconfig python3native DEPENDS += " \ libpcre2 \ diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 748633d9d..6ac534a28 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -38,7 +38,10 @@ PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" -RDEPENDS:${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" +# Inheriting setuptools3 incorrectly adds the dependency on ${PYTHON_PN}-core +# to ${PN} instead of to ${PN}-${PYTHON_PN} where it belongs. +RDEPENDS:${PN}:remove = "${PYTHON_PN}-core" +RDEPENDS:${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-core ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" FILES:${PN}-iiod = " \ ${sbindir}/iiod \ diff --git a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 25cfafafa..da8ea35d2 100644 --- a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d855 DEPENDS = "gd " -inherit autotools gettext +inherit autotools gettext pkgconfig do_configure:prepend() { sed -i "s#AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)#AC_PATH_PROG([GDLIB_CONFIG],[gdlib-config], ,[${STAGING_BINDIR_CROSS}])#" ${S}/configure.ac diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb index 7c9a2cbf6..2450d3196 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c9a1abacd0166f595a9fbe6afb1f0d5e" DEPENDS = "glib-2.0 ncurses libxml2 glib-2.0-native" -inherit meson +inherit meson pkgconfig # SRCREV = "0a44b1d01c41" # SRC_URI = "hg://keep.imfreedom.org/${BPN};module=${BPN} diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch deleted file mode 100644 index e6b673b11..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 98d277655e411f56fba705c0bf2efc6562c23807 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 15 Nov 2020 11:37:33 -0800 -Subject: [PATCH] Add support of arch riscv32 - -Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3138] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Foundation/include/Poco/Platform.h | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h -index 799db417e..b8506a248 100644 ---- a/Foundation/include/Poco/Platform.h -+++ b/Foundation/include/Poco/Platform.h -@@ -135,6 +135,7 @@ - #define POCO_ARCH_AARCH64 0x0f - #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64 - #define POCO_ARCH_RISCV64 0x10 -+#define POCO_ARCH_RISCV32 0x11 - - - #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) -@@ -225,12 +226,16 @@ - #elif defined(__AARCH64EB__) - #define POCO_ARCH POCO_ARCH_AARCH64 - #define POCO_ARCH_BIG_ENDIAN 1 --#elif defined(__riscv) && (__riscv_xlen == 64) -- #define POCO_ARCH POCO_ARCH_RISCV64 -- #define POCO_ARCH_LITTLE_ENDIAN 1 -+#elif defined(__riscv) -+ #if (__riscv_xlen == 64) -+ #define POCO_ARCH POCO_ARCH_RISCV64 -+ #define POCO_ARCH_LITTLE_ENDIAN 1 -+ #elif(__riscv_xlen == 32) -+ #define POCO_ARCH POCO_ARCH_RISCV32 -+ #define POCO_ARCH_LITTLE_ENDIAN 1 -+ #endif - #endif - -- - #if defined(__clang__) - #define POCO_COMPILER_CLANG - #elif defined(_MSC_VER) --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch new file mode 100644 index 000000000..625aa3191 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch @@ -0,0 +1,27 @@ +From 3f288fefbd683d687bde3fc63964da64bc3c8a40 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@siemens.com> +Date: Wed, 11 Aug 2021 15:11:49 +0200 +Subject: [PATCH] fix missing expat definition + +Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3414] +Signed-off-by: Pascal Bach <pascal.bach@siemens.com> +--- + XML/src/ParserEngine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/XML/src/ParserEngine.cpp b/XML/src/ParserEngine.cpp +index 82d477478..6213e555b 100644 +--- a/XML/src/ParserEngine.cpp ++++ b/XML/src/ParserEngine.cpp +@@ -504,7 +504,7 @@ void ParserEngine::init() + XML_SetParamEntityParsing(_parser, _externalParameterEntities ? XML_PARAM_ENTITY_PARSING_ALWAYS : XML_PARAM_ENTITY_PARSING_NEVER); + XML_SetUnknownEncodingHandler(_parser, handleUnknownEncoding, this); + +-#if XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4) ++#if XML_DTD && (XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4)) + if (_maximumAmplificationFactor > 1.0) + { + XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.0.bb index 5db518cbb..5f6391098 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.0.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "libpcre zlib" SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=poco-${PV} \ - file://0001-Add-support-of-arch-riscv32.patch \ + git://github.com/pocoproject/poco.git;branch=master \ + file://0001-fix-missing-expat-definition.patch \ file://run-ptest \ " -SRCREV = "a3d827d80eb7f3329c58e73eb2906cb7ba829019" +SRCREV = "f81a38057f1d240fe7b7a069612776f788bc88ea" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index c0b32e725..ac360659a 100644 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -13,7 +13,7 @@ SRC_URI = " \ SRCREV = "147dd722548358763a8b649b3e4b41dfffbcfbb6" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig PACKAGECONFIG ??= "alsa jack" PACKAGECONFIG[alsa] = ",,alsa-lib" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb index f52378b4b..5a915c476 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb @@ -29,7 +29,7 @@ SRCREV = "045862cc7d7dd986b349c68131df2f86b9b1cd9c" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" S = "${WORKDIR}/git" -inherit cmake features_check mime mime-xdg gtk-icon-cache +inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.1.bb index 4cf0dee11..15ba09982 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI += "git://github.com/martinmoene/span-lite" -SRCREV = "2987dd8d3b8fe7c861e3c3f879234cc1c412f03f" +SRCREV = "da49b231a25600b4431e00b564a6a20be95c1108" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch new file mode 100644 index 000000000..951bd5013 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch @@ -0,0 +1,442 @@ +Subject: Fix build errors with linux 5.14 + +Upstream-Status: backport + +svn-id: r89690 + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> + +Index: a/src/VBox/Additions/linux/drm/vbox_drv.h +=================================================================== +--- a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 89690) ++++ a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 90498) +@@ -227,6 +227,15 @@ + sizeof(HGSMIHOSTFLAGS)) + #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE + ++/** Field @pdev of struct drm_device was removed in 5.14. This macro ++ * transparently handles this change. Input argument is a pointer ++ * to struct drm_device. */ ++#if RTLNX_VER_MIN(5,14,0) ++# define VBOX_DRM_TO_PCI_DEV(_dev) to_pci_dev(_dev->dev) ++#else ++# define VBOX_DRM_TO_PCI_DEV(_dev) _dev->pdev ++#endif ++ + /** How frequently we refresh if the guest is not providing dirty rectangles. */ + #define VBOX_REFRESH_PERIOD (HZ / 2) + +Index: a/src/VBox/Additions/linux/drm/vbox_main.c +=================================================================== +--- a/src/VBox/Additions/linux/drm/vbox_main.c (revision 89690) ++++ a/src/VBox/Additions/linux/drm/vbox_main.c (revision 90498) +@@ -290,7 +290,7 @@ + /* Take a command buffer for each screen from the end of usable VRAM. */ + vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE; + +- vbox->vbva_buffers = pci_iomap_range(vbox->dev->pdev, 0, ++ vbox->vbva_buffers = pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0, + vbox->available_vram_size, + vbox->num_crtcs * + VBVA_MIN_BUFFER_SIZE); +@@ -311,7 +311,7 @@ + return 0; + + err_pci_iounmap: +- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers); ++ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers); + return ret; + } + +@@ -318,7 +318,7 @@ + static void vbox_accel_fini(struct vbox_private *vbox) + { + vbox_disable_accel(vbox); +- pci_iounmap(vbox->dev->pdev, vbox->vbva_buffers); ++ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->vbva_buffers); + } + + /** Do we support the 4.3 plus mode hint reporting interface? */ +@@ -393,7 +393,7 @@ + + /* Map guest-heap at end of vram */ + vbox->guest_heap = +- pci_iomap_range(vbox->dev->pdev, 0, GUEST_HEAP_OFFSET(vbox), ++ pci_iomap_range(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0, GUEST_HEAP_OFFSET(vbox), + GUEST_HEAP_SIZE); + if (!vbox->guest_heap) + return -ENOMEM; +@@ -442,7 +442,7 @@ + err_destroy_guest_pool: + gen_pool_destroy(vbox->guest_pool); + err_unmap_guest_heap: +- pci_iounmap(vbox->dev->pdev, vbox->guest_heap); ++ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap); + return ret; + } + +@@ -452,7 +452,7 @@ + cancel_delayed_work(&vbox->refresh_work); + vbox_accel_fini(vbox); + gen_pool_destroy(vbox->guest_pool); +- pci_iounmap(vbox->dev->pdev, vbox->guest_heap); ++ pci_iounmap(VBOX_DRM_TO_PCI_DEV(vbox->dev), vbox->guest_heap); + } + + #if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MIN(8,3) +@@ -567,12 +567,16 @@ + + size = roundup(size, PAGE_SIZE); + if (size == 0) ++ { ++ DRM_ERROR("bad size\n"); + return -EINVAL; ++ } + + ret = vbox_bo_create(dev, size, 0, 0, &vboxbo); + if (ret) { + if (ret != -ERESTARTSYS) + DRM_ERROR("failed to allocate GEM object\n"); ++ DRM_ERROR("failed to allocate GEM (%d)\n", ret); + return ret; + } + +@@ -628,6 +632,21 @@ + { + struct vbox_bo *vbox_bo = gem_to_vbox_bo(obj); + ++#if RTLNX_VER_MIN(5,14,0) ++ /* Starting from kernel 5.14, there is a warning appears in dmesg ++ * on attempt to desroy pinned buffer object. Make sure it is unpinned. */ ++ while (vbox_bo->bo.pin_count) ++ { ++ int ret; ++ ret = vbox_bo_unpin(vbox_bo); ++ if (ret) ++ { ++ DRM_ERROR("unable to unpin buffer object\n"); ++ break; ++ } ++ } ++#endif ++ + ttm_bo_put(&vbox_bo->bo); + } + +@@ -648,7 +667,7 @@ + u32 handle, u64 *offset) + { + struct drm_gem_object *obj; +- int ret; ++ int ret = 0; + struct vbox_bo *bo; + + mutex_lock(&dev->struct_mutex); +@@ -665,8 +684,15 @@ + bo = gem_to_vbox_bo(obj); + *offset = vbox_bo_mmap_offset(bo); + ++#if RTLNX_VER_MIN(5,14,0) ++ ret = drm_vma_node_allow(&bo->bo.base.vma_node, file); ++ if (ret) ++ { ++ DRM_ERROR("unable to grant previladges to user"); ++ } ++#endif ++ + drm_gem_object_put(obj); +- ret = 0; + + out_unlock: + mutex_unlock(&dev->struct_mutex); +Index: a/src/VBox/Additions/linux/drm/vbox_mode.c +=================================================================== +--- a/src/VBox/Additions/linux/drm/vbox_mode.c (revision 89690) ++++ a/src/VBox/Additions/linux/drm/vbox_mode.c (revision 90498) +@@ -245,6 +245,10 @@ + vbox_bo_unpin(bo); + vbox_bo_unreserve(bo); + } ++ else ++ { ++ DRM_ERROR("unable to lock buffer object: error %d\n", ret); ++ } + } + + if (&vbox->fbdev->afb == vbox_fb) +@@ -856,7 +860,9 @@ + vbox->cursor_data_size = data_size; + dst = vbox->cursor_data; + +-#if RTLNX_VER_MIN(5,12,0) ++#if RTLNX_VER_MIN(5,14,0) ++ ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.resource->num_pages, &uobj_map); ++#elif RTLNX_VER_MIN(5,12,0) + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &uobj_map); + #else + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &uobj_map); +Index: a/src/VBox/Additions/linux/drm/vbox_ttm.c +=================================================================== +--- a/src/VBox/Additions/linux/drm/vbox_ttm.c (revision 89690) ++++ a/src/VBox/Additions/linux/drm/vbox_ttm.c (revision 90498) +@@ -41,6 +41,10 @@ + # include <drm/ttm/ttm_page_alloc.h> + #endif + ++#if RTLNX_VER_MIN(5,14,0) ++# include <drm/ttm/ttm_range_manager.h> ++#endif ++ + #if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2) + #define PLACEMENT_FLAGS(placement) (placement) + #else +@@ -174,11 +178,13 @@ + *pl = vboxbo->placement; + } + ++#if RTLNX_VER_MAX(5,14,0) + static int vbox_bo_verify_access(struct ttm_buffer_object *bo, + struct file *filp) + { + return 0; + } ++#endif + + #if RTLNX_VER_MAX(5,10,0) + static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, +@@ -234,10 +240,10 @@ + mem->bus.caching = ttm_write_combined; + # endif + # if RTLNX_VER_MIN(5,10,0) +- mem->bus.offset = (mem->start << PAGE_SHIFT) + pci_resource_start(vbox->dev->pdev, 0); ++ mem->bus.offset = (mem->start << PAGE_SHIFT) + pci_resource_start(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0); + # else + mem->bus.offset = mem->start << PAGE_SHIFT; +- mem->start = pci_resource_start(vbox->dev->pdev, 0); ++ mem->start = pci_resource_start(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0); + # endif + mem->bus.is_iomem = true; + break; +@@ -373,7 +379,9 @@ + .eviction_valuable = ttm_bo_eviction_valuable, + #endif + .evict_flags = vbox_bo_evict_flags, ++#if RTLNX_VER_MAX(5,14,0) + .verify_access = vbox_bo_verify_access, ++#endif + .io_mem_reserve = &vbox_ttm_io_mem_reserve, + .io_mem_free = &vbox_ttm_io_mem_free, + #if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5) +@@ -451,12 +459,12 @@ + } + + #ifdef DRM_MTRR_WC +- vbox->fb_mtrr = drm_mtrr_add(pci_resource_start(dev->pdev, 0), +- pci_resource_len(dev->pdev, 0), ++ vbox->fb_mtrr = drm_mtrr_add(pci_resource_start(VBOX_DRM_TO_PCI_DEV(dev), 0), ++ pci_resource_len(VBOX_DRM_TO_PCI_DEV(dev), 0), + DRM_MTRR_WC); + #else +- vbox->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0), +- pci_resource_len(dev->pdev, 0)); ++ vbox->fb_mtrr = arch_phys_wc_add(pci_resource_start(VBOX_DRM_TO_PCI_DEV(dev), 0), ++ pci_resource_len(VBOX_DRM_TO_PCI_DEV(dev), 0)); + #endif + return 0; + +@@ -477,8 +485,8 @@ + { + #ifdef DRM_MTRR_WC + drm_mtrr_del(vbox->fb_mtrr, +- pci_resource_start(vbox->dev->pdev, 0), +- pci_resource_len(vbox->dev->pdev, 0), DRM_MTRR_WC); ++ pci_resource_start(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0), ++ pci_resource_len(VBOX_DRM_TO_PCI_DEV(vbox->dev), 0), DRM_MTRR_WC); + #else + arch_phys_wc_del(vbox->fb_mtrr); + #endif +@@ -560,6 +568,9 @@ + static const struct drm_gem_object_funcs vbox_drm_gem_object_funcs = { + .free = vbox_gem_free_object, + .print_info = drm_gem_ttm_print_info, ++# if RTLNX_VER_MIN(5,14,0) ++ .mmap = drm_gem_ttm_mmap, ++# endif + }; + #endif + +@@ -598,6 +609,17 @@ + sizeof(struct vbox_bo)); + #endif + ++#if RTLNX_VER_MIN(5,14,0) ++ /* Initialization of the following was removed from DRM stack ++ * in 5.14, so we need to do it manually. */ ++ vboxbo->bo.base.funcs = &vbox_drm_gem_object_funcs; ++ kref_init(&vboxbo->bo.base.refcount); ++ vboxbo->bo.base.size = size; ++ vboxbo->bo.base.dev = dev; ++ dma_resv_init(&vboxbo->bo.base._resv); ++ drm_vma_node_reset(&vboxbo->bo.base.vma_node); ++#endif ++ + ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size, + ttm_bo_type_device, &vboxbo->placement, + #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) +@@ -613,7 +635,11 @@ + NULL, vbox_bo_ttm_destroy); + #endif + if (ret) +- goto err_free_vboxbo; ++ { ++ /* In case of failure, ttm_bo_init() supposed to call ++ * vbox_bo_ttm_destroy() which in turn will free @vboxbo. */ ++ goto err_exit; ++ } + + *pvboxbo = vboxbo; + +@@ -621,12 +647,15 @@ + + err_free_vboxbo: + kfree(vboxbo); ++err_exit: + return ret; + } + + static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo) + { +-#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3) ++#if RTLNX_VER_MIN(5,14,0) ++ return bo->bo.resource->start << PAGE_SHIFT; ++#elif RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3) + return bo->bo.mem.start << PAGE_SHIFT; + #else + return bo->bo.offset; +@@ -685,7 +714,7 @@ + struct ttm_operation_ctx ctx = { false, false }; + # endif + #endif +- int ret; ++ int ret = 0; + #if RTLNX_VER_MAX(5,11,0) + int i; + #endif +@@ -765,6 +794,7 @@ + { + struct drm_file *file_priv; + struct vbox_private *vbox; ++ int ret = -EINVAL; + + if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) + return -EINVAL; +@@ -772,5 +802,12 @@ + file_priv = filp->private_data; + vbox = file_priv->minor->dev->dev_private; + +- return ttm_bo_mmap(filp, vma, &vbox->ttm.bdev); ++#if RTLNX_VER_MIN(5,14,0) ++ if (drm_dev_is_unplugged(file_priv->minor->dev)) ++ return -ENODEV; ++ ret = drm_gem_mmap(filp, vma); ++#else ++ ret = ttm_bo_mmap(filp, vma, &vbox->ttm.bdev); ++#endif ++ return ret; + } +Index: a/src/VBox/Additions/linux/drm/vbox_fb.c +=================================================================== +--- a/src/VBox/Additions/linux/drm/vbox_fb.c (revision 89690) ++++ a/src/VBox/Additions/linux/drm/vbox_fb.c (revision 90498) +@@ -301,7 +301,9 @@ + return ret; + } + +-#if RTLNX_VER_MIN(5,12,0) ++#if RTLNX_VER_MIN(5,14,0) ++ ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.resource->num_pages, &bo->kmap); ++#elif RTLNX_VER_MIN(5,12,0) + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &bo->kmap); + #else + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap); +@@ -337,8 +339,8 @@ + * This seems to be done for safety checking that the framebuffer + * is not registered twice by different drivers. + */ +- info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); +- info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0); ++ info->apertures->ranges[0].base = pci_resource_start(VBOX_DRM_TO_PCI_DEV(dev), 0); ++ info->apertures->ranges[0].size = pci_resource_len(VBOX_DRM_TO_PCI_DEV(dev), 0); + + #if RTLNX_VER_MIN(5,2,0) || RTLNX_RHEL_MAJ_PREREQ(8,2) + /* +Index: a/src/VBox/Additions/linux/drm/vbox_drv.c +=================================================================== +--- a/src/VBox/Additions/linux/drm/vbox_drv.c (revision 89690) ++++ a/src/VBox/Additions/linux/drm/vbox_drv.c (revision 90498) +@@ -43,6 +43,10 @@ + # include <drm/drm_probe_helper.h> + #endif + ++#if RTLNX_VER_MIN(5,14,0) ++# include <drm/drm_aperture.h> ++#endif ++ + #include "version-generated.h" + #include "revision-generated.h" + +@@ -65,12 +69,23 @@ + struct drm_device *dev = NULL; + int ret = 0; + ++# if RTLNX_VER_MIN(5,14,0) ++ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "vboxvideofb"); ++ if (ret) ++ { ++ printk("unable to remove conflicting framebuffer devices\n"); ++ return ret; ++ } ++# endif /* 5.14 */ ++ + dev = drm_dev_alloc(&driver, &pdev->dev); + if (IS_ERR(dev)) { + ret = PTR_ERR(dev); + goto err_drv_alloc; + } ++#if RTLNX_VER_MAX(5,14,0) + dev->pdev = pdev; ++#endif + pci_set_drvdata(pdev, dev); + + ret = vbox_driver_load(dev); +@@ -125,7 +140,7 @@ + + drm_kms_helper_poll_disable(dev); + +- pci_save_state(dev->pdev); ++ pci_save_state(VBOX_DRM_TO_PCI_DEV(dev)); + + drm_fb_helper_set_suspend_unlocked(&vbox->fbdev->helper, true); + +@@ -147,7 +162,7 @@ + { + int ret; + +- if (pci_enable_device(dev->pdev)) ++ if (pci_enable_device(VBOX_DRM_TO_PCI_DEV(dev))) + return -EIO; + + ret = vbox_drm_thaw(dev); +Index: a/src/VBox/Additions/linux/drm/vbox_irq.c +=================================================================== +--- a/src/VBox/Additions/linux/drm/vbox_irq.c (revision 89690) ++++ a/src/VBox/Additions/linux/drm/vbox_irq.c (revision 90498) +@@ -206,7 +206,7 @@ + INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker); + vbox_update_mode_hints(vbox); + #if RTLNX_VER_MIN(3,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,1) +- return drm_irq_install(vbox->dev, vbox->dev->pdev->irq); ++ return drm_irq_install(vbox->dev, VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq); + #else + return drm_irq_install(vbox->dev); + #endif diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch new file mode 100644 index 000000000..0d960fa4f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch @@ -0,0 +1,118 @@ +Subject: Fix regops build errors with linux 5.14 + +Upstream-Status: backport + +svn-id: r90497 + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> + +Index: a/src/VBox/Additions/linux/sharedfolders/regops.c +=================================================================== +--- a/src/VBox/Additions/linux/sharedfolders/regops.c (revision 88716) ++++ a/src/VBox/Additions/linux/sharedfolders/regops.c (revision 90497) +@@ -2126,7 +2126,11 @@ + int rc = 0; + + Assert(iov_iter_count(iter) + pStash->cb > 0); ++# if RTLNX_VER_MIN(5,14,0) ++ if (!(iter->iter_type & ITER_KVEC)) { ++#else + if (!(iter->type & ITER_KVEC)) { ++#endif + /* + * Do we have a stashed page? + */ +@@ -2372,7 +2376,9 @@ + static size_t vbsf_iter_max_span_of_pages(struct iov_iter *iter) + { + size_t cPages; +-# if RTLNX_VER_MIN(3,16,0) ++#if RTLNX_VER_MIN(5,14,0) ++ if (iter_is_iovec(iter) || (iter->iter_type & ITER_KVEC)) { ++#elif RTLNX_VER_MIN(3,16,0) + if (iter_is_iovec(iter) || (iter->type & ITER_KVEC)) { + #endif + const struct iovec *pCurIov = iter->iov; +@@ -2436,7 +2442,11 @@ + } else { + /* Won't bother with accurate counts for the next two types, just make + some rough estimates (does pipes have segments?): */ ++# if RTLNX_VER_MIN(5,14,0) ++ size_t cSegs = iter->iter_type & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1; ++# else + size_t cSegs = iter->type & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1; ++#endif + cPages = (iov_iter_count(iter) + (PAGE_SIZE * 2 - 2) * cSegs) >> PAGE_SHIFT; + } + # endif +@@ -2588,8 +2598,14 @@ + struct vbsf_reg_info *sf_r = kio->ki_filp->private_data; + struct vbsf_super_info *pSuperInfo = VBSF_GET_SUPER_INFO(inode->i_sb); + ++#if RTLNX_VER_MIN(5,14,0) + SFLOGFLOW(("vbsf_reg_read_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n", ++ inode, kio->ki_filp, cbToRead, kio->ki_pos, iter->iter_type)); ++#else ++ SFLOGFLOW(("vbsf_reg_read_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n", + inode, kio->ki_filp, cbToRead, kio->ki_pos, iter->type)); ++#endif ++ + AssertReturn(S_ISREG(inode->i_mode), -EINVAL); + + /* +@@ -2823,9 +2839,13 @@ + bool const fAppend = RT_BOOL(kio->ki_filp->f_flags & O_APPEND); + # endif + +- ++#if RTLNX_VER_MIN(5,14,0) + SFLOGFLOW(("vbsf_reg_write_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n", ++ inode, kio->ki_filp, cbToWrite, offFile, iter->iter_type)); ++#else ++ SFLOGFLOW(("vbsf_reg_write_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n", + inode, kio->ki_filp, cbToWrite, offFile, iter->type)); ++#endif + AssertReturn(S_ISREG(inode->i_mode), -EINVAL); + + /* +@@ -3737,7 +3757,27 @@ + } + #endif /* KERNEL_VERSION >= 2.6.24 */ + ++#if RTLNX_VER_MIN(5,14,0) ++static int vbsf_write_end(struct file *file, struct address_space *mapping, ++ loff_t pos, unsigned int len, unsigned int copied, ++ struct page *page, void *fsdata) ++{ ++ static uint64_t volatile s_cCalls = 0; ++ if (s_cCalls++ < 16) ++ { ++ printk("vboxsf: Unexpected call to vbsf_write_end(pos=%#llx len=%#x)! Please report.\n", ++ (unsigned long long)pos, len); ++ RTLogBackdoorPrintf("vboxsf: Unexpected call to vbsf_write_end(pos=%#llx len=%#x)! Please report.\n", ++ (unsigned long long)pos, len); ++# ifdef WARN_ON ++ WARN_ON(1); ++# endif ++ } + ++ return -ENOTSUPP; ++} ++#endif ++ + #if RTLNX_VER_MIN(2,4,10) + + # ifdef VBOX_UEK +@@ -3791,8 +3831,11 @@ + #if RTLNX_VER_MIN(2,5,12) + .set_page_dirty = __set_page_dirty_buffers, + #endif +-#if RTLNX_VER_MIN(2,6,24) ++#if RTLNX_VER_MIN(5,14,0) + .write_begin = vbsf_write_begin, ++ .write_end = vbsf_write_end, ++#elif RTLNX_VER_MIN(2,6,24) ++ .write_begin = vbsf_write_begin, + .write_end = simple_write_end, + #elif RTLNX_VER_MIN(2,5,45) + .prepare_write = simple_prepare_write, diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb index 689782b7f..84651ae64 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb @@ -13,13 +13,15 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://r89690-5.14-fixes.patch \ + file://r90497-regops-5.14-fix.patch \ " SRC_URI[md5sum] = "fce04bbef244b4df1a50e53d132d3e6f" SRC_URI[sha256sum] = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195" S ?= "${WORKDIR}/vbox_module" -S_task-patch = "${WORKDIR}/${VBOX_NAME}" +S:task-patch = "${WORKDIR}/${VBOX_NAME}" export BUILD_TARGET_ARCH="${ARCH}" export BUILD_TARGET_ARCH:x86-64="amd64" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb index 59a0dfff2..c1b22886f 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb @@ -17,6 +17,6 @@ DEPENDS = "\ DEPENDS:append:libc-musl = " argp-standalone" LDFLAGS:append:libc-musl = " -largp" -inherit meson +inherit meson pkgconfig BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb index b30055549..30e83457c 100644 --- a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.4.1.bb @@ -14,6 +14,12 @@ SRCREV = "54e965fa9d269c2b3ff9036d81f32bac3df0edea" S = "${WORKDIR}/git" +do_configure:prepend() { + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test +} + do_install() { # Just a bunch of bash scripts to install ${S}/install.sh ${D}${prefix} ${baselib} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc index 688622afa..1a729c975 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc @@ -1,5 +1,5 @@ DESCRIPTION = "An extension that includes Bootstrap in your project, without any boilerplate code." -LICENSE = "BSD" +LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a03749709f06118a17349deb5a210619" SRC_URI[md5sum] = "e40d50f5c5b6438c1c6200a6f2871f81" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.0.bb index cb5eab15a..999fd5a3d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Advanced Enumerations library" HOMEPAGE = "https://pypi.org/project/aenum/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" SRC_URI[sha256sum] = "87f0e9ef4f828578ab06af30e4d7944043bf4ecd3f4b7bd1cbe37e2173cde94a" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.10.0.bb index cf92c8e9c..ba89e9db3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.10.0.bb @@ -3,8 +3,7 @@ HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" -SRC_URI[md5sum] = "57fd468ae3eb055f6871106e8f7813e2" -SRC_URI[sha256sum] = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25" +SRC_URI[sha256sum] = "c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891" inherit pypi setuptools3 @@ -12,6 +11,8 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-html5lib \ ${PYTHON_PN}-lxml \ ${PYTHON_PN}-soupsieve \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-logging \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.3.4.bb index 17b5d931c..5a674f009 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.3.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "0edf630a4471a48627aec0b840cf3b8e10901191d328f6511560420459de282e" +SRC_URI[sha256sum] = "f19c62425576d3d1821ed711b94d1a4e5ede8f05ca121e99b6d978ed49c7a765" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb index 91df9875f..edf3246bc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Composable style cycles" HOMEPAGE = "http://github.com/matplotlib/cycler" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811" SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.1.0.bb index f7594e87e..2e44c3d80 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.0.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.1.0.bb @@ -9,7 +9,7 @@ decorator, just because you can." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=be2fd2007972bf96c08af3293d728b22" -SRC_URI[sha256sum] = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5" +SRC_URI[sha256sum] = "e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb index f77d11e25..ff0104cc8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb @@ -1,6 +1,6 @@ SUMMARY = "Serialize all of python" HOMEPAGE = "https://pypi.org/project/dill/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=41adceb584fdde8323ddf9ad23c07fe5" SRC_URI[sha256sum] = "9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_2.5.0.bb index 1a2123011..40cf8bda7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_2.5.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Python bindings and utilities for GeoJSON" HOMEPAGE = "https://pypi.org/project/geojson/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=f48972abe5cddee79e301574742ed745" SRC_URI[md5sum] = "14753ed28678828b1de73f68b04e2324" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.7.bb index 5808c8db0..83ee57926 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.7.bb @@ -1,6 +1,6 @@ SUMMARY = "A wrapper for the Gnu Privacy Guard (GPG or GnuPG)" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b0b7ac63b60085b23fa9f7e1951daa1d" PYPI_PACKAGE = "python-gnupg" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.39.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.40.0.bb index 865124450..f86bf008f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.39.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.40.0.bb @@ -11,7 +11,7 @@ DEPENDS += "${PYTHON_PN}-grpcio" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" -SRC_URI[sha256sum] = "39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805" +SRC_URI[sha256sum] = "d440f2bc089ff628618c536904d5bc39d0b44f7afdda4c4c1ecd15fcf385bfba" RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.39.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.40.0.bb index 76d38a264..1cfb96749 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.39.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.40.0.bb @@ -12,7 +12,7 @@ SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ file://mips_bigendian.patch \ file://0001-absl-always-use-asm-sgidefs.h.patch \ " -SRC_URI[sha256sum] = "57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407" +SRC_URI[sha256sum] = "3d172158fe886a2604db1b6e17c2de2ab465fe0fe36aba2ec810ca8441cefe3a" RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.4.0.bb index cc2380262..89000b793 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.4.0.bb @@ -11,7 +11,7 @@ SRC_URI:append = " \ file://0001-setup.py-Fix-numpy-version.patch \ " -inherit pypi setuptools3 +inherit pkgconfig pypi setuptools3 BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.7.2.bb index 4c064c3d4..2433a8c9d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.7.2.bb @@ -3,11 +3,11 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://setup.py;beginline=244;endline=252;md5=3e00c41c6d04310707992b93307a224f" -DEPENDS += "pkgconfig icu" +DEPENDS += "icu" PYPI_PACKAGE = "PyICU" SRC_URI[sha256sum] = "1382869b22d91cc99274f9b525fa7d9199b44d9007ff0036a09747839a01e9dc" SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" -inherit pypi setuptools3 +inherit pkgconfig pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb index 587aea1f0..2a28cf9ec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Vestigial utilities from IPython" HOMEPAGE = "http://ipython.org" AUTHOR = "IPython Development Team <ipython-dev@scipy.org>" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.md;md5=f7c3032c3ac398265224533a0a333a35" PYPI_PACKAGE = "ipython_genutils" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb index 2ec0722c3..3c64b82c2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb @@ -1,7 +1,7 @@ SUMMARY = "IPython: Productive Interactive Computing" HOMEPAGE = "https://ipython.org" AUTHOR = "The IPython Development Team <ipython-dev@python.org>" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb index 765de4d4f..8655150b0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb @@ -4,7 +4,7 @@ and another function for converting Julian calendar dates to Julian dates are de Two functions for the reverse calculations are also defined." HOMEPAGE = "https://github.com/phn/jdcal" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;md5=bd236e1f590973467a427bb354be0f46" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb index cf14c49e6..dac6cd48b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb @@ -1,6 +1,6 @@ SUMMARY = "A fast implementation of the Cassowary constraint solver" HOMEPAGE = "https://github.com/nucleic/kiwi" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=e54bd74bd9d0a84ae3f8f6d21ada0ab4" SRC_URI[sha256sum] = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb index 241ffcfc0..669c2eaee 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb @@ -20,7 +20,7 @@ DEPENDS += "libxml2 libxslt" SRC_URI[sha256sum] = "39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468" -inherit pypi setuptools3 +inherit pkgconfig pypi setuptools3 # {standard input}: Assembler messages: # {standard input}:1488805: Error: branch out of range diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb index e1c52e7ba..3337df490 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb @@ -3,7 +3,7 @@ SUMMARY = "Python library for arbitrary-precision floating-point arithmetic" HOMEPAGE = "https://pypi.org/project/mpmath/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=71970bd3749eebe1bfef9f1efff5b37a" SRC_URI[sha256sum] = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.8.bb index 52489b854..3d1f46e50 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.8.bb @@ -9,6 +9,15 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148 inherit pypi setuptools3 -SRC_URI[sha256sum] = "6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251" +SRC_URI[sha256sum] = "4f2770348c029ce9433316ced8f91ed37d2a605e654f8bfdc93a3524561a8ce2" -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-jdcal ${PYTHON_PN}-et-xmlfile" +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-jdcal \ + ${PYTHON_PN}-et-xmlfile \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-xml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.3.3.bb index 55700b51c..6e557ed7b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.3.3.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" -SRC_URI[sha256sum] = "cbcb84d63867af3411fa063af3de64902665bb5b3d40b25b2059e40603594e87" +SRC_URI[sha256sum] = "272c8cb14aa9793eada6b1ebe81994616e647b5892a370c7135efb2924b701df" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb index 00a4ec86b..14c90ffb5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb @@ -1,6 +1,6 @@ SUMMARY = "Execute commands and copy files over SSH to multiple machines at once." HOMEPAGE = "https://github.com/krig/parallax/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=52c67ffa6102f288a0347f8c5802fd18" SRC_URI[md5sum] = "e312397b083426af84db7076dc2a28d7" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.9.1.bb index 22603209e..5871ee216 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.18.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.9.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" -SRC_URI[sha256sum] = "14e34563cdad5f01d193f1ef7cd859a0fbdaa846726d44b0b68f4451a7458458" +SRC_URI[sha256sum] = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32" RDEPENDS:${PN} += " \ libpulse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb index 5295bdaed..2870ec9c0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A cross-platform clipboard module for Python. (only handles plain text for now)" HOMEPAGE = "https://github.com/asweigart/pyperclip" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" SRC_URI[sha256sum] = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb index a159975f7..3565da7d1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Non-validating SQL parser module" HOMEPAGE = "http://pypi.python.org/pypi/sqlparse" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.8.bb index 1dd0a5a85..e274857f7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.8.bb @@ -3,7 +3,7 @@ SUMMARY = "Computer algebra system (CAS) in Python" HOMEPAGE = "https://pypi.org/project/sympy/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=2245824980a408ef1749391dfba32b3b" SRC_URI[sha256sum] = "1ca588a9f6ce6a323c5592f9635159c2093572826668a1022c75c75bdf0297cb" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb index 499fb3704..cbc9f44bc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb @@ -7,7 +7,7 @@ PYPI_PACKAGE = "systemd-python" DEPENDS += "systemd (<=234)" RDEPENDS:${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging python3-syslog" REQUIRED_DISTRO_FEATURES = "systemd" -inherit pypi features_check setuptools3 +inherit pypi features_check pkgconfig setuptools3 SRC_URI[md5sum] = "5071ea5bcb976186e92a3f5e75df221d" SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb index da234215e..120604a8b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Traitlets Python config system" HOMEPAGE = "http://ipython.org" AUTHOR = "IPython Development Team <ipython-dev@scipy.org>" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.md;md5=eec4de4d599518742e54e75954e33b46" PYPI_PACKAGE = "traitlets" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb index 211b2b3c8..ab33ce66e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Character encoding aliases for legacy web content" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRC_URI[md5sum] = "32f6e261d52e57bf7e1c4d41546d15b8" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb index 765201ca7..ef04024aa 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "\ SRC_URI[md5sum] = "69284f943982f54ded76960c92098a02" SRC_URI[sha256sum] = "61cde7b096bccd69ddc75c85b17f8baed45c3687d404706d91403a319453b903" -inherit pypi distutils3 +inherit pkgconfig pypi distutils3 DEPENDS += "parted" diff --git a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb index 76f59e285..963351a2e 100644 --- a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Send file to trash natively under Mac OS X, Windows and Linux" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a02659c2d5f4cc626e4dcf6504b865eb" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb index 1ac4fcbf2..e5d187957 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb @@ -26,8 +26,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[md5sum] = "a7088cec171b0d00bf43394ce64d3909" -SRC_URI[sha256sum] = "1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c" +SRC_URI[sha256sum] = "65b965d6890ea90d9706595e4b7b9365b5060bec8ea723449480b4769974133b" S = "${WORKDIR}/httpd-${PV}" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service index b244d1866..ca13f7287 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service @@ -1,13 +1,15 @@ +# SPDX-License-Identifier: GPL-3.0-or-later [Unit] -Description=Netdata, Real-time performance monitoring +Description=Real time performance monitoring RequiresMountsFor=/var +After=network.target [Service] -User=root +Type=simple ExecStartPre=/bin/mkdir -p /var/log/netdata -ExecStartPre=/bin/chown -R nobody.netdata @@datadir/netdata/web -ExecStartPre=/bin/chown -R nobody.netdata /var/cache/netdata -ExecStart=/usr/sbin/netdata -nd +ExecStartPre=/bin/chown -R netdata.netdata /var/log/netdata +ExecStart=/usr/sbin/netdata -D -u netdata + [Install] WantedBy=multi-user.target 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 7c48b8a37..7ec989815 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -1,17 +1,19 @@ -HOMEPAGE = "https://github.com/firehol/netdata/" +HOMEPAGE = "https://github.com/netdata/netdata/" SUMMARY = "Real-time performance monitoring" +DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ + Open-source, free, preconfigured, opinionated, and always real-time." LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" +SRC_URI:append = " git://github.com/firehol/netdata.git;protocol=https" SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766" PV = "1.22.1" # default netdata.conf for netdata configuration -SRC_URI += "file://netdata.conf" +SRC_URI += " file://netdata.conf" # file for providing systemd service support -SRC_URI += "file://netdata.service" +SRC_URI += " file://netdata.service" S = "${WORKDIR}/git" @@ -31,7 +33,7 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" #User specific USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system netdata" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" do_install:append() { #set S UID for plugins @@ -50,6 +52,13 @@ do_install:append() { sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata + install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata + + chown -R netdata:netdata ${D}${datadir}/netdata/web } +FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" + RDEPENDS:${PN} = "bash zlib" 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 35f541941..92317c83f 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 @@ -13,7 +13,7 @@ SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" S = "${WORKDIR}/git" -inherit gettext meson features_check +inherit gettext meson features_check pkgconfig REQUIRED_DISTRO_FEATURES = "systemd x11" |