diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
26 files changed, 181 insertions, 684 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.20.0.bb index 530e061968..cedcf9fee0 100644 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.20.0.bb @@ -15,10 +15,9 @@ inherit autotools ALLOW_EMPTY:${PN} = "1" -LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" +LIC_FILES_CHKSUM = "file://COPYING;md5=416f4cc4f79551b690babb14ef1a5799" -SRC_URI[md5sum] = "00807b2e976f467b3cec85d1589f0825" -SRC_URI[sha256sum] = "4af9875df5497fdd507231f4b7346e17d96fc06fe10fd30e2b3750715a329113" +SRC_URI[sha256sum] = "204374d3cadff1b57a63f4c343cbadcee28374c072dc04b549d772dbba9f650c" SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.0.bb index b478b86bae..ad94009b71 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.0.bb @@ -19,12 +19,12 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ HOMEPAGE = "http://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.QUICK;md5=81b447d779e278628c843aef92f088fa" +LIC_FILES_CHKSUM = "file://README.QUICK;md5=7912d9213b3547f8a81aadd08893fe84" DEPENDS = "libatomic-ops" -SRCREV = "d3dede3ce4462cd82a15f161af797ca51654546a" -SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_0" +SRCREV = "47e9106c17b72e9ee5501308f69ea94531e798b3" +SRC_URI = "git://github.com/ivmai/bdwgc.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb index 65fa0f44b0..64dd94a9ed 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb @@ -2,7 +2,7 @@ require ${BPN}.inc FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:" -inherit meson native +inherit meson pkgconfig native DEPENDS += " \ meson-native \ diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb index 66dc4a5802..563a0ee00a 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -1,6 +1,6 @@ require ${BPN}.inc -inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd +inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" diff --git a/meta-openembedded/meta-oe/recipes-support/driverctl/driverctl_0.111.bb b/meta-openembedded/meta-oe/recipes-support/driverctl/driverctl_0.111.bb new file mode 100644 index 0000000000..7404f40c21 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/driverctl/driverctl_0.111.bb @@ -0,0 +1,28 @@ +SUMMARY = "driverctl is a device driver control utility for Linux" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" + +REQUIRED_DISTRO_FEATURES = "systemd" + +DEPENDS = "systemd" +RDEPENDS:${PN} += "bash bash-completion" + +SRC_URI = " git://gitlab.com/driverctl/driverctl.git" +SRCREV = "fa9dce43d1a667d6e6e26895fbed01b3b04362c9" + +S = "${WORKDIR}/git" + +inherit pkgconfig systemd features_check + +FILES:${PN} += "${libdir}" +FILES:${PN} += "${libdir}/udev" +FILES:${PN} += "${libdir}/udev/rules.d" +FILES:${PN} += "${systemd_unitdir}" +FILES:${PN} += "${systemd_unitdir}/system" +FILES:${PN} += "${datadir}" +FILES:${PN} += "${datadir}/bash-completion" +FILES:${PN} += "${datadir}/bash-completion/completions" + +do_install () { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch new file mode 100644 index 0000000000..04fe644d47 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch @@ -0,0 +1,43 @@ +From f703b1184229796d504a2e833f72ace4cc605d15 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Wed, 12 May 2021 12:48:15 +0200 +Subject: [PATCH 1/2] Fix FIPS mode support and build with OpenSSL 3.0 + +FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode` +and `FIPS_mode_set` functions, which were removed there. Just a note that +the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned +functions are still there (see https://wiki.openssl.org/index.php/FIPS_modules). +Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support. + +See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937 +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + winpr/libwinpr/utils/ssl.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c +index 3a8590390..03b23af43 100644 +--- a/winpr/libwinpr/utils/ssl.c ++++ b/winpr/libwinpr/utils/ssl.c +@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags) + #else + WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); + ++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ if (!EVP_default_properties_is_fips_enabled(NULL)) ++#else + if (FIPS_mode() != 1) ++#endif + { ++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ if (EVP_set_default_properties(NULL, "fips=yes")) ++#else + if (FIPS_mode_set(1)) ++#endif + WLog_INFO(TAG, "Openssl fips mode ENabled!"); + else + { +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch new file mode 100644 index 0000000000..728638e15d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch @@ -0,0 +1,28 @@ +From 4dbf108c0ae5e997d5c432f3da4b4c5fd7b35373 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 1 Aug 2021 12:14:43 -0400 +Subject: [PATCH 2/2] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 + +Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + winpr/libwinpr/utils/ssl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c +index 03b23af43..74ef156e7 100644 +--- a/winpr/libwinpr/utils/ssl.c ++++ b/winpr/libwinpr/utils/ssl.c +@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void) + { + #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) + return FALSE; ++#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ return (EVP_default_properties_is_fips_enabled(NULL) == 1); + #else + return (FIPS_mode() == 1); + #endif +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb index f46834445e..78af5389b6 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb @@ -16,6 +16,8 @@ PKGV = "${GITPKGVTAG}" SRCREV = "14c7f7aed7dd4e2454ee0cd81028b9f790885021" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0 \ file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch \ + file://0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb index 2b87281793..c22030b983 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.8.bb @@ -6,6 +6,6 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala -SRC_URI = "git://github.com/hughsie/libgusb.git" -SRCREV = "ff9c606d9d72c7dd369ad220d92729556faaaf0c" +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main" +SRCREV = "db9edbd8b45662d551194a0985173732f8f557a5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb new file mode 100644 index 0000000000..66fb5a3ffb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "A simple, lightweight JavaScript API for handling cookies." +HOMEPAGE = "https://github.com/js-cookie/js-cookie" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e16cf0e247d84f8999bf55865a9c98cf" + +SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=http" + +SRCREV = "0ba77141dd215782cc7770347a457906908c66ff" + +S = "${WORKDIR}/git" + +JQUERYCOOKIEDIR = "${datadir}/javascript/jquery-cookie" +JQUERYCOOKIEDOCDIR = "${docdir}/libjs-jquery-cookie" + +do_install() { + install -d ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.js ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/src/*.mjs ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.json ${D}${JQUERYCOOKIEDIR} + + install -d ${D}${JQUERYCOOKIEDOCDIR} + install -m 0644 ${S}/*.md ${D}${JQUERYCOOKIEDOCDIR} + +} + +FILES:${PN} += "${datadir}/javascript/jquery-cookie" +FILES:${PN}-doc += "${docdir}/libjs-jquery-cookie" diff --git a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb new file mode 100644 index 0000000000..a87c5bf758 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A JavaScript library for internationalization and localization that leverages the official Unicode CLDR JSON data" +SECTION = "console/network" +HOMEPAGE = "https://github.com/globalizejs/globalize" +LICENSE = "MIT" + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea" + +SRC_URI = "git://github.com/globalizejs/globalize;tag=1.7.0;nobranch=1" + +FILES:${PN} = "${datadir}/javascript/jquery-globalize" +FILES:${PN}-doc += "${docdir}/${PN}" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/*.js ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/globalize/*.js ${D}${datadir}/javascript/jquery-globalize/ + + install -d ${D}${docdir}/${PN}/ + install -m 0644 ${S}/LICENSE ${D}${docdir}/${PN}/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/links/links_2.22.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.25.bb index f2b4a6a80d..1986358b21 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links_2.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links_2.25.bb @@ -8,5 +8,4 @@ EXTRA_OECONF = "--enable-graphics \ --without-libtiff --without-svgalib --with-fb \ --without-directfb --without-pmshell --without-atheos \ --without-x" -SRC_URI[sha256sum] = "0364986b3a7f1e8e3171bea362b53f71e1dd3360a8842d66fdc65580ebc2084d" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" +SRC_URI[sha256sum] = "2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.9.bb index 146ad55c65..85c81fb799 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.9.bb @@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "e43b63db2f78336e2aa123e8d015dbabc1720a15361714bfd4b1bb4e5e87768c" +SRC_URI[sha256sum] = "757db8cda4bb2873599e47783af463e3b547a627b0cabb30ea7bf71fb4c24937" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb index 361ac0cb95..8d557e0868 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb @@ -230,4 +230,8 @@ do_install:append() { sed -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake fi + # remove setup_vars_opencv4.sh as its content is confusing and useless + if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then + rm -rf ${D}${bindir}/setup_vars_opencv4.sh + fi } diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb index e8bb505e44..44a0dccbba 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb @@ -24,6 +24,7 @@ EXTRA_OECONF = " \ --disable-static \ --disable-ctapi \ --disable-doc \ + --disable-strict \ " EXTRA_OEMAKE = "DESTDIR=${D}" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.09.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.10.0.bb index 0ecf199732..164a348815 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.09.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.10.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b" +SRC_URI[sha256sum] = "964b5b16290fbec3fae57c2a5bcdea49bb0736bd750c3a3711c47995c9efc394" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.1.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb index 15ba099826..0079cf7298 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.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 = "da49b231a25600b4431e00b564a6a20be95c1108" +SRCREV = "cbb9c3c5162a0d7018c7b3e053153a04d4fbbbb9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb index 36ca8f91ae..c726bef3b5 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb @@ -45,6 +45,7 @@ ASNEEDED = "" LDFLAGS:append:mips = " -latomic" LDFLAGS:append:mipsel = " -latomic" +LDFLAGS:append:riscv32:toolchain-clang = " -latomic" LDFLAGS:append:libc-musl = " -lucontext" diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html deleted file mode 100644 index a02442ad97..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/files/license.html +++ /dev/null @@ -1,98 +0,0 @@ -<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html> - - - -<head> - -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<meta http-equiv="Content-Language" content="en-us"> -<meta name="VI60_defaultClientScript" content="JavaScript"> -<meta name="GENERATOR" content="Microsoft FrontPage 12.0"> -<meta name="keywords" content="Unicode Standard, copyright"> -<meta name="ProgId" content="FrontPage.Editor.Document"> -<title>Unicode License Agreement</title> -<link rel="stylesheet" type="text/css" - -href="http://www.unicode.org/webscripts/standard_styles.css"> - -<style type="text/css"> -pre { - FONT-FAMILY: Arial, Geneva, sans-serif; -} -</style> - - -</head> - - -<body text="#330000"> - - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - - <!-- BEGIN CONTENTS --> - - <td> - - -<blockquote> -<h2><a name="License">UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</a></h2> - -<pre> -See <a href="https://www.unicode.org/copyright.html">Terms of Use</a> for definitions of Unicode Inc.'s -Data Files and Software. - -NOTICE TO USER: Carefully read the following legal agreement. -BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S -DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), -YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE -TERMS AND CONDITIONS OF THIS AGREEMENT. -IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE -THE DATA FILES OR SOFTWARE. - -COPYRIGHT AND PERMISSION NOTICE - -Copyright © 1991-2019 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in https://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any associated documentation -(the "Software") to deal in the Data Files or Software -without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files -or Software are furnished to do so, provided that either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT OF THIRD PARTY RIGHTS. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THE DATA FILES OR SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in these Data Files or Software without prior -written authorization of the copyright holder. -</pre> - -</blockquote> - - - - </td> - - </tr> - - </table> -</body> -</html> diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb index 06f97940cb..2a0188649c 100644 --- a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb @@ -1,14 +1,14 @@ SUMMARY = "Unicode Character Database" HOMEPAGE = "https://unicode.org/ucd/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../license.html;beginline=42;endline=85;md5=ddcaebcc17ab633995f12c383599f377" +LIC_FILES_CHKSUM = "file://${WORKDIR}/license.html;beginline=43;endline=83;md5=cf6c4777b109bcee78b6083a21be6192" SRC_URI = " \ https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ - file://license.html \ + https://www.unicode.org/license.html;name=license \ " -SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" -SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" +SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" +SRC_URI[license.sha256sum] = "e415e1f2188ef2b1a5f7e6ee8c60cefe8a49dacd8b96c9025cad5013985129e4" inherit allarch diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils index 495601f08f..5982e2d08c 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils @@ -13,7 +13,7 @@ INCLUDES = -I. -I../vboxsf -I../vboxsf/include MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -CFLAGS = ${INCLUDES} ${MOD_DEFS} +CFLAGS = ${INCLUDES} ${MOD_DEFS} ${EXTRA_CFLAGS} LDFLAGS = SRCS = mount.vboxsf.c \ 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 deleted file mode 100644 index 951bd5013d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r89690-5.14-fixes.patch +++ /dev/null @@ -1,442 +0,0 @@ -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 deleted file mode 100644 index 0d960fa4f5..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/r90497-regops-5.14-fix.patch +++ /dev/null @@ -1,118 +0,0 @@ -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.28.bb index 84651ae64a..0265e38f5f 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.28.bb @@ -13,12 +13,10 @@ 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" +SRC_URI[md5sum] = "c6efae8dc115b90c6124e13126794c4f" +SRC_URI[sha256sum] = "8d34993d8e9c0cf35e7bd44dd26c8c757f17a3b7d5a64052f945d00fd798ebfe" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" @@ -56,7 +54,7 @@ do_configure:prepend() { # compile and install mount utility do_compile() { oe_runmake all - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + oe_runmake 'LD=${CC}' 'EXTRA_CFLAGS=-I${STAGING_KERNEL_BUILDDIR}/include/' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then echo "ERROR: One of vbox*.ko modules wasn't built" exit 1 diff --git a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb index fd22defb24..25dbe1379c 100644 --- a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb @@ -21,3 +21,5 @@ S = "${WORKDIR}/git" FILES:${PN} += "${libdir}/xorg/modules/*" INSANE_SKIP:${PN} += "xorg-driver-abi" + +PNBLACKLIST[xorgxrdp] ?= "Depends on xrdp which needs porting to openssl 3.x" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.17.bb index 6d8659844c..e933c6679f 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.17.bb @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ file://0001-Fix-the-compile-error.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ " -SRCREV = "a4c7ee077c049202d73f82f518b2de958d722890" +SRCREV = "58088324956d94fd2eb5e7694a318cccec6990f1" S = "${WORKDIR}/git" @@ -92,3 +92,4 @@ pkg_postinst:${PN}() { fi fi } +PNBLACKLIST[xrdp] ?= "Needs porting to openssl 3.x" |