diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-30 23:17:28 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-30 23:18:26 +0300 |
commit | d767d3fb1ba70f03e0e212c24f41404f1248f660 (patch) | |
tree | 4d4edb47d2feadc58ecb1556be3ef484b8559ac8 /meta-openembedded/meta-oe/recipes-support | |
parent | 8c7c9f834fb9bcc6eaf21e509c7627f13086b5a7 (diff) | |
download | openbmc-d767d3fb1ba70f03e0e212c24f41404f1248f660.tar.xz |
subtree updateshardknott
poky: 14c5392fde..b89bb2651d:
Alexander Kanavin (3):
devtool: correctly handle non-standard source tree locations in upgrades
devtool: print a warning on upgrades if PREFERRED_VERSION is set
nettle: update 3.7.2 -> 3.7.3
Alexandre Belloni (1):
oeqa/runtime/cases: make date.DateTest.test_date more reliable
Anton Blanchard (1):
kmod: use nonarch_base_libdir for depmod.d and modprobe.d
Armin Kuster (1):
gnutls: Enable seccomp if FEATURE is set
Bruce Ashfield (17):
linux-yocto: add vfat KERNEL_FEATURE when MACHINE_FEATURES include vfat
linux-yocto/5.10: update to v5.10.49
linux-yocto/5.4: update to v5.4.131
linux-yocto/5.10: update to v5.10.50
linux-yocto/5.4: update to v5.4.132
linux-yocto/5.10: update to v5.10.52
linux-yocto/5.4: update to v5.4.134
linux-yocto/5.10: update to v5.10.53
linux-yocto/5.4: update to v5.4.135
linux-yocto-rt/5.10: update to -rt47
linux-yocto/5.10: enable TYPEC_TCPCI in usbc fragment
linux-yocto/5.10: update to v5.10.55
linux-yocto/5.4: update to v5.4.137
linux-yocto/5.4: update to v5.4.139
linux-yocto/5.10: update to v5.10.57
kernel-devsrc: 5.14+ updates
kernel-devsrc: fix 5.14+ objtool compilation
Changqing Li (1):
archiver.bbclass: fix do_ar_configured failure for kernel
Chen Qi (2):
systemd: fix CVE-2020-13529
zstd: fix CVE_PRODUCT
Damian Wrobel (1):
gobject-introspection: Fix the license (add MIT)
Dmitry Baryshkov (1):
linux-firmware: add more Qualcomm firmware packages
Joe Slater (2):
util-linux: fix CVE 2021-37600
terminal.bbclass: force bash for devshell
Jon Mason (1):
parselogs.py: qemuarm should be qemuarmv5
Jose Quaresma (1):
sstate.bbclass: fix error handling when sstate mirrors is ro
Khairul Rohaizzat Jamaluddin (1):
glibc: Fix CVE-2021-33574
Khem Raj (4):
ovmf: Fix VLA warnings with GCC 11
stress-ng: Drop defining daddr_t
gnutls: Point to staging area for finding seccomp libs and includes
sdk: Enable do_populate_sdk with multilibs
Lee Chee Yang (2):
aspell: fix CVE-2019-25051
qemu: fix CVE-2021-3527
Marek Vasut (1):
update-rc.d: update SRCREV to pull in fix for non-bash shell support
Marta Rybczynska (1):
lzo: add CVE_PRODUCT
Matthias Klein (1):
runqemu: Fix typo in error message
Matthias Schiffer (1):
initscripts: fix creation order for /var/log with VOLATILE_LOG_DIR=true
Michael Opdenacker (4):
oe-setup-builddir: update YP docs and OE URLs
cve-check: fix comments
cve-check: update link to NVD website for CVE details
cve-check: improve comment about CVE patch file names
Mingli Yu (3):
netbase: use git fetcher
curl: fix CVE-2021-22925
curl: fix CVES
Nicolas Dechesne (4):
yocto-check-layer: improve missed dependencies
checklayer: new function get_layer_dependencies()
checklayer: rename _find_layer_depends
yocto-check-layer: ensure that all layer dependencies are tested too
Oleksandr Kravchuk (1):
bitbake.conf: change GNOME_MIRROR to new one
Oleksandr Popovych (1):
utils: Reduce the number of calls to the "dirname" command
Patrick Williams (1):
pixman: re-disable iwmmxt
Ralph Siemsen (1):
oeqa/manual/toaster: fix small typo
Richard Purdie (6):
pseudo: Add uninative configuration sanity check
pseudo: Update to latest version including statx fix
sstate: Drop pseudo exclusion
sstate: Fix rebuilds when changing layer config
license: Exclude COPYING.MIT from pseudo
oeqa/runtime/cases/ptest: Increase test timeout from 300s to 450s
Ross Burton (9):
parted: improve ptest execution
parted: fix ptest RRECOMMENDS
parted: skip tests that need vfat support
avahi: fix CVE-2021-36217, crash on pinging '.local'
glew: fix Makefile race
qemu: fix virtio vhost-user-gpu CVEs
tar: ignore node-tar CVEs
e2fsprogs: ensure small images have 256-byte inodes
wic: don't forcibly pass -T default
Sakib Sajal (5):
go: fix CVE-2020-29509, CVE-2020-29511
qemu: fix CVE-2021-3582
qemu: fix CVE-2021-3607
qemu: fix CVE-2021-3608
go: upgrade 1.16.5 -> 1.16.7
Tony Tascioglu (6):
valgrind: skip flaky ptest fb_test_amd64
ffmpeg: fix CVE-2020-20446
ffmpeg: fix CVE-2020-20453
ffmpeg: fix CVE-2020-22015
ffmpeg: fix CVE-2020-22021
ffmpeg: fix CVE-2020-22019 and CVE-2020-22033
Trevor Gamblin (1):
python3-pip: fix CVE-2021-3572
Ulrich Ölmann (2):
initramfs-framework: fix whitespace issue
initramfs-framework/setup-live: fix shebang
Vinay Kumar (2):
glibc: Fix CVE-2021-35942
glibc: Fix CVE-2021-38604
hongxu (2):
createrepo-c: fix createrepo-c failed in nativesdk
sdk: fix relocate symlink failed
leimaohui (1):
archiver.bbclass: Fix patch error for recipes that inherit dos2unix.
wangmy (1):
gnutls: upgrade 3.7.1 -> 3.7.2
meta-openembedded: 5a4b2ab29d..5741b949a8:
Anastasios Kavoukis (1):
pm-qa: fix paths for shell scripts
Armin Kuster (1):
wireshark: update to 3.4.7
Changqing Li (2):
ndpi: fix CVE-2021-36082
linuxptp: upgrade 3.1 -> 3.1.1
Devendra Tewari (1):
Suppress eol in functionfs setup scripts (#147)
Gianfranco (1):
vboxguestdrivers: upgrade 6.1.22 -> 6.1.24
Joe Slater (1):
php: move to version 7.4.21
Kai Kang (1):
libdbi-perl: fix CVE-2014-10402
Khem Raj (2):
fvwm: Package extra files and man pages
fvwm: Fix build time paths in target perl/python scripts
Li Wang (1):
openlldp: fix segfault
Michael Opdenacker (1):
bigbuckbunny-1080p: fix sample video URL
Mingli Yu (3):
mariadb: redefine log-error item
mariadb: Update SRC_URI
polkit: fix CVE-2021-3560
Paulo Neves (1):
htop: Add ncurses-terminfo-base to RDEPENDS
Roland Hieber (2):
curlpp: fix override syntax
ldns: fix override syntax
Sakib Sajal (1):
gd: fix CVE-2021-38115
Tony Battersby (3):
net-snmp: fix QA Issue after LDFLAGS change
curlpp: fix QA Issue after LDFLAGS change
ldns: fix QA Issue after LDFLAGS change
Tony Tascioglu (1):
redis: fix CVE-2021-32625
wangmy (2):
nghttp2: upgrade 1.43.0 -> 1.44.0
libtalloc: upgrade 2.3.2 -> 2.3.3
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I12cf9ce6cd256bd08bd4e97856ba45ccb993ddc4
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch | 33 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch | 276 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb (renamed from meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb) | 6 |
5 files changed, 39 insertions, 279 deletions
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 new file mode 100644 index 0000000000..649b9b744f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch @@ -0,0 +1,33 @@ +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 + +CVE: CVE-2021-38115 +Upstream-Status: Backport [8b111b2b4a4842179be66db68d84dda91a246032] + +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + 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_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb index 37896415ee..557b45dc49 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.2.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ + file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \ " SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb index 8e9b95d91d..c757f7fb59 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb @@ -31,3 +31,5 @@ PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" PACKAGECONFIG[sensors] = "--with-sensors,--without-sensors,lmsensors,lmsensors-libsensors" FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" + +RDEPENDS_${PN} += "ncurses-terminfo-base" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch deleted file mode 100644 index e95e240492..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch +++ /dev/null @@ -1,276 +0,0 @@ -Subject: Fix build errors with linux 5.13 -Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk -Bug: https://bugs.launchpad.net/bugs/1929193 - -diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h ---- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h 2021-04-28 16:24:47.000000000 +0000 -+++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h 2021-06-23 10:08:44.431714404 +0000 -@@ -46,20 +41,20 @@ - * Evaluates to true if the linux kernel version is equal or higher to the - * one specfied. */ - #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \ -- (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) - - /** @def RTLNX_VER_MAX - * Evaluates to true if the linux kernel version is less to the one specfied - * (exclusive). */ - #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \ -- (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) -+ (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) - - /** @def RTLNX_VER_RANGE - * Evaluates to true if the linux kernel version is equal or higher to the given - * minimum version and less (but not equal) to the maximum version (exclusive). */ - #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin, a_MajorMax, a_MinorMax, a_PatchMax) \ -- ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ -- && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) -+ ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ -+ && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) - - - /** @def RTLNX_RHEL_MIN -@@ -70,7 +65,7 @@ - */ - #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) - # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \ -- ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) -+ ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) - #else - # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0) - #endif -@@ -83,7 +78,7 @@ - */ - #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) - # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \ -- ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) -+ ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) - #else - # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) - #endif -@@ -95,7 +90,7 @@ - */ - #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) - # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) \ -- (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) -+ (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) - #else - # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) (0) - #endif -@@ -173,7 +168,9 @@ - #include <drm/ttm/ttm_bo_api.h> - #include <drm/ttm/ttm_bo_driver.h> - #include <drm/ttm/ttm_placement.h> -+#if RTLNX_VER_MAX(5,13,0) - #include <drm/ttm/ttm_memory.h> -+#endif - #if RTLNX_VER_MAX(5,12,0) - # include <drm/ttm/ttm_module.h> - #endif -@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st - VBVA_ADAPTER_INFORMATION_SIZE) - #define GUEST_HEAP_SIZE VBVA_ADAPTER_INFORMATION_SIZE - #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \ -- sizeof(HGSMIHOSTFLAGS)) -+ sizeof(struct hgsmi_host_flags)) - #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE - - /** How frequently we refresh if the guest is not providing dirty rectangles. */ -@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st - static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size, - gfp_t flags) - { -- return devm_kzalloc(dev, n * size, flags); -+ return devm_kzalloc(dev, n * size, flags); - } - #endif - -@@ -244,7 +241,7 @@ struct vbox_private { - u8 __iomem *guest_heap; - u8 __iomem *vbva_buffers; - struct gen_pool *guest_pool; -- struct VBVABUFFERCONTEXT *vbva_info; -+ struct vbva_buf_context *vbva_info; - bool any_pitch; - u32 num_crtcs; - /** Amount of available VRAM, including space used for buffers. */ -@@ -252,7 +249,7 @@ struct vbox_private { - /** Amount of available VRAM, not including space used for buffers. */ - u32 available_vram_size; - /** Array of structures for receiving mode hints. */ -- VBVAMODEHINT *last_mode_hints; -+ struct vbva_modehint *last_mode_hints; - - struct vbox_fbdev *fbdev; - -@@ -263,7 +260,11 @@ struct vbox_private { - struct drm_global_reference mem_global_ref; - struct ttm_bo_global_ref bo_global_ref; - #endif -+#if RTLNX_VER_MIN(5,13,0) -+ struct ttm_device bdev; -+#else - struct ttm_bo_device bdev; -+#endif - bool mm_initialised; - } ttm; - -diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c ---- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-04-28 16:24:47.000000000 +0000 -+++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-06-23 10:08:07.164057918 +0000 -@@ -48,7 +43,11 @@ - #endif - - -+#if RTLNX_VER_MIN(5,13,0) -+static inline struct vbox_private *vbox_bdev(struct ttm_device *bd) -+#else - static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) -+#endif - { - return container_of(bd, struct vbox_private, ttm.bdev); - } -@@ -188,7 +187,7 @@ static int vbox_ttm_io_mem_reserve(struc - mem->bus.size = mem->num_pages << PAGE_SHIFT; - mem->bus.base = 0; - mem->bus.is_iomem = false; -- if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) -+ if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) - return -EINVAL; - switch (mem->mem_type) { - case TTM_PL_SYSTEM: -@@ -205,8 +204,13 @@ static int vbox_ttm_io_mem_reserve(struc - return 0; - } - #else -+# if RTLNX_VER_MAX(5,13,0) - static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, - struct ttm_resource *mem) -+# else /* > 5.13.0 */ -+static int vbox_ttm_io_mem_reserve(struct ttm_device *bdev, -+ struct ttm_resource *mem) -+# endif /* > 5.13.0 */ - { - struct vbox_private *vbox = vbox_bdev(bdev); - mem->bus.addr = NULL; -@@ -241,7 +245,12 @@ static int vbox_ttm_io_mem_reserve(struc - - - --#if RTLNX_VER_MIN(5,10,0) -+#if RTLNX_VER_MIN(5,13,0) -+static void vbox_ttm_io_mem_free(struct ttm_device *bdev, -+ struct ttm_resource *mem) -+{ -+} -+#elif RTLNX_VER_MIN(5,10,0) - static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, - struct ttm_resource *mem) - { -@@ -253,7 +262,13 @@ static void vbox_ttm_io_mem_free(struct - } - #endif - --#if RTLNX_VER_MIN(5,10,0) -+#if RTLNX_VER_MIN(5,13,0) -+static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt) -+{ -+ ttm_tt_fini(tt); -+ kfree(tt); -+} -+#elif RTLNX_VER_MIN(5,10,0) - static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) - { - ttm_tt_fini(tt); -@@ -333,7 +348,11 @@ static int vbox_bo_move(struct ttm_buffe - } - #endif - -+#if RTLNX_VER_MIN(5,13,0) -+static struct ttm_device_funcs vbox_bo_driver = { -+#else /* < 5.13.0 */ - static struct ttm_bo_driver vbox_bo_driver = { -+#endif /* < 5.13.0 */ - .ttm_tt_create = vbox_ttm_tt_create, - #if RTLNX_VER_MIN(5,10,0) - .ttm_tt_destroy = vbox_ttm_tt_destroy, -@@ -370,14 +389,22 @@ int vbox_mm_init(struct vbox_private *vb - { - int ret; - struct drm_device *dev = vbox->dev; -+#if RTLNX_VER_MIN(5,13,0) -+ struct ttm_device *bdev = &vbox->ttm.bdev; -+#else - struct ttm_bo_device *bdev = &vbox->ttm.bdev; -+#endif - - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - ret = vbox_ttm_global_init(vbox); - if (ret) - return ret; - #endif -+#if RTLNX_VER_MIN(5,13,0) -+ ret = ttm_device_init(&vbox->ttm.bdev, -+#else - ret = ttm_bo_device_init(&vbox->ttm.bdev, -+#endif - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - vbox->ttm.bo_global_ref.ref.object, - #endif -@@ -429,7 +456,11 @@ int vbox_mm_init(struct vbox_private *vb - return 0; - - err_device_release: -+#if RTLNX_VER_MIN(5,13,0) -+ ttm_device_fini(&vbox->ttm.bdev); -+#else - ttm_bo_device_release(&vbox->ttm.bdev); -+#endif - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - err_ttm_global_release: - vbox_ttm_global_release(vbox); -@@ -446,7 +477,11 @@ void vbox_mm_fini(struct vbox_private *v - #else - arch_phys_wc_del(vbox->fb_mtrr); - #endif -+#if RTLNX_VER_MIN(5,13,0) -+ ttm_device_fini(&vbox->ttm.bdev); -+#else - ttm_bo_device_release(&vbox->ttm.bdev); -+#endif - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - vbox_ttm_global_release(vbox); - #endif -@@ -528,7 +563,9 @@ int vbox_bo_create(struct drm_device *de - { - struct vbox_private *vbox = dev->dev_private; - struct vbox_bo *vboxbo; -+#if RTLNX_VER_MAX(5,13,0) - size_t acc_size; -+#endif - int ret; - - vboxbo = kzalloc(sizeof(*vboxbo), GFP_KERNEL); -@@ -551,16 +588,20 @@ int vbox_bo_create(struct drm_device *de - - vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); - -+#if RTLNX_VER_MAX(5,13,0) - acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, - sizeof(struct vbox_bo)); -+#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) - align >> PAGE_SHIFT, false, NULL, acc_size, --#else -+#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */ - align >> PAGE_SHIFT, false, acc_size, --#endif -+#else /* > 5.13.0 */ -+ align >> PAGE_SHIFT, false, -+#endif /* > 5.13.0 */ - #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) - NULL, NULL, vbox_bo_ttm_destroy); - #else diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb index 19b8f8f46e..1b2fb44036 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb @@ -13,11 +13,11 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://40-linux-5.13-support.patch \ file://add__divmoddi4.patch \ " -SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80" -SRC_URI[sha256sum] = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49" + +SRC_URI[md5sum] = "fce04bbef244b4df1a50e53d132d3e6f" +SRC_URI[sha256sum] = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195" S ?= "${WORKDIR}/vbox_module" S_task-patch = "${WORKDIR}/${VBOX_NAME}" |