| 1 |
commit: e413567e5b45bde18607c150e5ba1ad4c9f38cc5 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 22 16:05:20 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 22 16:54:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e413567e |
| 7 |
|
| 8 |
app-emulation/virtualbox: Revbump to fix LsiLogicSAS storage controller |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
.../virtualbox-6.1.20-lsilogicsas_crash_fix.patch | 41 ++++++++++++++++++++++ |
| 13 |
...x-6.1.20.ebuild => virtualbox-6.1.20-r1.ebuild} | 6 +++- |
| 14 |
2 files changed, 46 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch b/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..7f1e4b17983 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch |
| 21 |
@@ -0,0 +1,41 @@ |
| 22 |
+Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp |
| 23 |
+=================================================================== |
| 24 |
+--- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 88530) |
| 25 |
++++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 88643) |
| 26 |
+@@ -3678,8 +3678,6 @@ |
| 27 |
+ LogFlowFunc(("pThis=%#p\n", pThis)); |
| 28 |
+ |
| 29 |
+- /* Clear everything first. */ |
| 30 |
+ AssertPtrReturnVoid(pThisCC->pConfigurationPages); |
| 31 |
+ PMptConfigurationPagesSupported pPages = pThisCC->pConfigurationPages; |
| 32 |
+- memset(pPages, 0, sizeof(MptConfigurationPagesSupported)); |
| 33 |
+ |
| 34 |
+ /* Manufacturing Page 0. */ |
| 35 |
+Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h |
| 36 |
+=================================================================== |
| 37 |
+--- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h (revision 82968) |
| 38 |
++++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h (revision 88643) |
| 39 |
+@@ -3327,13 +3327,17 @@ |
| 40 |
+ |
| 41 |
+ #define MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(pg, type, nr, flags) \ |
| 42 |
++ RT_ZERO(*pg); \ |
| 43 |
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_MANUFACTURING) |
| 44 |
+ |
| 45 |
+ #define MPT_CONFIG_PAGE_HEADER_INIT_IO_UNIT(pg, type, nr, flags) \ |
| 46 |
++ RT_ZERO(*pg); \ |
| 47 |
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IO_UNIT) |
| 48 |
+ |
| 49 |
+ #define MPT_CONFIG_PAGE_HEADER_INIT_IOC(pg, type, nr, flags) \ |
| 50 |
++ RT_ZERO(*pg); \ |
| 51 |
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IOC) |
| 52 |
+ |
| 53 |
+ #define MPT_CONFIG_PAGE_HEADER_INIT_BIOS(pg, type, nr, flags) \ |
| 54 |
++ RT_ZERO(*pg); \ |
| 55 |
+ MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_BIOS) |
| 56 |
+ |
| 57 |
+@@ -3342,4 +3346,5 @@ |
| 58 |
+ */ |
| 59 |
+ #define MPT_CONFIG_EXTENDED_PAGE_HEADER_INIT(pg, cb, nr, flags, exttype) \ |
| 60 |
++ RT_BZERO(pg, cb); \ |
| 61 |
+ (pg)->u.fields.ExtHeader.u8PageType = (flags) | MPT_CONFIGURATION_PAGE_TYPE_EXTENDED; \ |
| 62 |
+ (pg)->u.fields.ExtHeader.u8PageNumber = (nr); \ |
| 63 |
|
| 64 |
diff --git a/app-emulation/virtualbox/virtualbox-6.1.20.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild |
| 65 |
similarity index 99% |
| 66 |
rename from app-emulation/virtualbox/virtualbox-6.1.20.ebuild |
| 67 |
rename to app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild |
| 68 |
index 6af250ffce5..95da7ce00ed 100644 |
| 69 |
--- a/app-emulation/virtualbox/virtualbox-6.1.20.ebuild |
| 70 |
+++ b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild |
| 71 |
@@ -139,6 +139,10 @@ REQUIRED_USE=" |
| 72 |
${PYTHON_REQUIRED_USE} |
| 73 |
" |
| 74 |
|
| 75 |
+PATCHES=( |
| 76 |
+ "${FILESDIR}/${P}-lsilogicsas_crash_fix.patch" |
| 77 |
+) |
| 78 |
+ |
| 79 |
pkg_pretend() { |
| 80 |
if ! use headless && ! use qt5 ; then |
| 81 |
einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." |
| 82 |
@@ -214,7 +218,7 @@ src_prepare() { |
| 83 |
|
| 84 |
eapply "${WORKDIR}/patches" |
| 85 |
|
| 86 |
- eapply_user |
| 87 |
+ default |
| 88 |
} |
| 89 |
|
| 90 |
doecho() { |
Archives