diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
29 files changed, 805 insertions, 275 deletions
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/cmark/cmark_0.30.1.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb index e2db8aa76..6669c6e50 100644 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "977b128291c0cf6c5053cdcf2ac72e627f09c105" +SRCREV = "a8da5a2f252b96eca60ae8bada1a9ba059a38401" S = "${WORKDIR}/git" inherit cmake lib_package 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/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch new file mode 100644 index 000000000..84b5a4da9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch @@ -0,0 +1,72 @@ +From cb507309937958c632147de87e8f1231d6698847 Mon Sep 17 00:00:00 2001 +From: Antonio Sanchez <cantonios@google.com> +Date: Tue, 14 Sep 2021 10:57:22 -0700 +Subject: [PATCH] Default eigen_packet_wrapper constructor. + +This makes it trivial, allowing use of `memcpy`. + +Fixes #2326 + +Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/merge_requests/645/diffs?commit_id=cb507309937958c632147de87e8f1231d6698847] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +* fixes build failures for arm targets with NEON enabled (e.g. -mfpu=neon-vfpv4) + for recipes with -Werror enabled and gcc-11, e.g. fuse-core, robot-localization, + prbt-ikfast-manipulator-plugin, rm-chassis-controllers in meta-ros1-noetic: + +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::pload(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1671:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1671 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::ploadu(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1716:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1716 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +cc1plus: all warnings being treated as errors + +--- + Eigen/src/Core/GenericPacketMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h +index 8f8f64f15..72234288e 100644 +--- a/Eigen/src/Core/GenericPacketMath.h ++++ b/Eigen/src/Core/GenericPacketMath.h +@@ -162,7 +162,7 @@ struct eigen_packet_wrapper + { + EIGEN_ALWAYS_INLINE operator T&() { return m_val; } + EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } +- EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} ++ EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; + EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} + EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { + m_val = v; +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb index 54b6f74d8..9682f7a8e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \ " -SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ + file://0001-Default-eigen_packet_wrapper-constructor.patch \ +" SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" 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..488d4e3b0 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -18,7 +18,6 @@ DISTUTILS_SETUP_PATH ?= "${B}/bindings/python/" DEPENDS = " \ flex-native bison-native libaio \ - ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ " inherit cmake python3native systemd setuptools3 @@ -31,14 +30,22 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "usb_backend network_backend serial_backend" +NETWORK_BACKEND_DEPENDENCIES = "\ + libxml2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ +" + PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2" -PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF, ${NETWORK_BACKEND_DEPENDENCIES}" PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2" 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/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb new file mode 100644 index 000000000..f14b619a9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Highly customizable checkboxes and radio buttons (jQuery & Zepto)" +SECTION = "console/network" +HOMEPAGE = "http://fronteed.com/iCheck" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://icheck.js;start_line=1;end_line=8;md5=404078d7de9f05ed64d364274f790055" + +DEPENDS = "virtual/libc" + +SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV};tag=${PV}" + +FILES:${PN} += "${datadir}/javascript/jquery-icheck" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.js ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.min.js ${D}${datadir}/javascript/jquery-icheck/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/ + install -m 0644 ${S}/skins/all.css ${D}${datadir}/javascript/jquery-icheck/skins/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + install -m 0644 ${S}/skins/flat/* ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + install -m 0644 ${S}/skins/futurico/* ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/line/ + install -m 0644 ${S}/skins/line/* ${D}${datadir}/javascript/jquery-icheck/skins/line/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + install -m 0644 ${S}/skins/minimal/* ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + install -m 0644 ${S}/skins/polaris/* ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/square/ + install -m 0644 ${S}/skins/square/* ${D}${datadir}/javascript/jquery-icheck/skins/square/ +} + 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/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch new file mode 100644 index 000000000..5d88d1a6a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch @@ -0,0 +1,41 @@ +From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 +From: Vincent Rabaud <vrabaud@google.com> +Date: Sat, 10 Jul 2021 00:21:52 +0200 +Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. + +The two argument versions has been deprecated, cf +https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream + +Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp +index 2fc4d84f46..ebecf95eea 100644 +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -92,6 +92,7 @@ + #ifdef HAVE_PROTOBUF + #include <google/protobuf/io/coded_stream.h> + #include <google/protobuf/io/zero_copy_stream_impl.h> ++#include <google/protobuf/stubs/common.h> + #include <google/protobuf/text_format.h> + + #include <opencv2/core.hpp> +@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by + + bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { + CodedInputStream coded_input(input); ++#if GOOGLE_PROTOBUF_VERSION >= 3006000 ++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); ++#else + coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); ++#endif + + return proto->ParseFromCodedStream(&coded_input); + } +-- +2.32.0 + 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 7eefbccfe..361ac0cb9 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 @@ -52,6 +52,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ + file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" 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/sass/libsass_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb index 9cba3a890..bc2ec805e 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools SRC_URI = "git://github.com/sass/libsass.git;branch=master" -SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396" -PV = "3.6.4" +SRCREV = "f6afdbb9288d20d1257122e71d88e53348a53af3" +PV = "3.6.5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb index 3c7a55cc3..407cbbddd 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb @@ -7,8 +7,8 @@ DEPENDS = "libsass" inherit autotools pkgconfig SRC_URI = "git://github.com/sass/sassc.git" -SRCREV = "46748216ba0b60545e814c07846ca10c9fefc5b6" +SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" S = "${WORKDIR}/git" -PV = "3.6.1" +PV = "3.6.2" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb new file mode 100644 index 000000000..50d995838 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "the compiling PHP template engine" +SECTION = "console/network" +HOMEPAGE = "https://www.smarty.net/" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" + +DEPENDS = "php" + +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;tag=v${PV}" + +FILES:${PN} = "${datadir}/php/smarty3/" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/php/smarty3/libs/ + install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/ + + install -d ${D}${datadir}/php/smarty3/libs/plugins + install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/ + + install -d ${D}${datadir}/php/smarty3/libs/sysplugins + install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/ +} 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" |