diff options
author | Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2023-07-20 10:52:05 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-07-21 09:39:09 -0700 |
commit | a39ae61fab5b7b72c7e425c109ff0f7e5a558bf2 (patch) | |
tree | a3b2d40585d92dc5991204809eb254a7c5f0f2bb /meta-oe/recipes-support/vboxguestdrivers | |
parent | 40978c420007e2fec08f4500a565dd7c85307cf0 (diff) | |
download | meta-openembedded-a39ae61fab5b7b72c7e425c109ff0f7e5a558bf2.tar.gz |
vbxguestdrivers: upgrade 7.0.8 -> 7.0.10
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/vboxguestdrivers')
-rw-r--r-- | meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch | 43 | ||||
-rw-r--r-- | meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb (renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb) | 4 |
3 files changed, 1 insertions, 75 deletions
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch deleted file mode 100644 index 37ef3a9d58..0000000000 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch +++ /dev/null @@ -1,29 +0,0 @@ -Initial support for kernel 6.4 -https://www.virtualbox.org/changeset/99666/vbox - -Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch] - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> - ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -75,4 +75,11 @@ - #if RTLNX_VER_MAX(2,5,12) - # define PageUptodate(a_pPage) Page_Uptodate(a_pPage) -+#endif -+ -+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ -+#if RTLNX_VER_MIN(6,4,0) -+# define VBOX_ITER_IOV(_iter) iter_iov(_iter) -+#else -+# define VBOX_ITER_IOV(_iter) iter->iov - #endif - -@@ -2400,5 +2407,5 @@ - if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { - # endif -- const struct iovec *pCurIov = iter->iov; -+ const struct iovec *pCurIov = VBOX_ITER_IOV(iter); - size_t cLeft = iter->nr_segs; - size_t cPagesSpan = 0; - diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch deleted file mode 100644 index 20c8fbd3fd..0000000000 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch +++ /dev/null @@ -1,43 +0,0 @@ -Initial support for kernel 6.4 -https://www.virtualbox.org/changeset/99667/vbox - - -Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch] - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> - ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -77,11 +77,4 @@ - #endif - --/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ --#if RTLNX_VER_MIN(6,4,0) --# define VBOX_ITER_IOV(_iter) iter_iov(_iter) --#else --# define VBOX_ITER_IOV(_iter) iter->iov --#endif -- - - /********************************************************************************************************************************* -@@ -94,4 +87,12 @@ - #else - # define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->type) -+#endif -+ -+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field -+ * of struct iov_iter. */ -+#if RTLNX_VER_MIN(6,4,0) -+# define VBSF_GET_ITER_IOV(_iter) iter_iov(_iter) -+#else -+# define VBSF_GET_ITER_IOV(_iter) iter->iov - #endif - -@@ -2407,5 +2408,5 @@ - if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { - # endif -- const struct iovec *pCurIov = VBOX_ITER_IOV(iter); -+ const struct iovec *pCurIov = VBSF_GET_ITER_IOV(iter); - size_t cLeft = iter->nr_segs; - size_t cPagesSpan = 0; - diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb index 233323bf75..f193636524 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb @@ -13,11 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch \ - file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch \ " -SRC_URI[sha256sum] = "c305fbe480f507eac7c36893ead66dffaacda944f19c3813a4533e9c39bae237" +SRC_URI[sha256sum] = "0b1e6d8b7f87d017c7fae37f80586acff04f799ffc1d51e995954d6415dee371" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" |