From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCHv3] vboxguestdrivers: upgrade to 5.2.8
Date: Fri, 2 Mar 2018 00:42:08 +0000 [thread overview]
Message-ID: <20180302004208.1841-1-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <20180224105155.14511-1-Martin.Jansa@gmail.com>
* 5.1.26 doesn't build with 4.15 kernel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90 ----------------------
...tdrivers_5.2.6.bb => vboxguestdrivers_5.2.8.bb} | 7 +-
2 files changed, 2 insertions(+), 95 deletions(-)
delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.2.6.bb => vboxguestdrivers_5.2.8.bb} (91%)
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
deleted file mode 100644
index 23a9021f04..0000000000
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-Based on:
-https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
-
-Upstream-Status: Pending (hopefully new vbox will be released soon with proper 4.15 support, this patch isn't backwards compatible)
-
---- vbox_module.orig/vboxvideo/vbox_mode.c 2018-02-18 16:42:47.000000000 +0000
-+++ vbox_module/vboxvideo/vbox_mode.c 2018-02-18 16:55:14.466029313 +0000
-@@ -396,7 +396,7 @@
-
- /* pick the encoder ids */
- if (enc_id)
-- return drm_encoder_find(connector->dev, enc_id);
-+ return drm_encoder_find(connector->dev, NULL, enc_id);
-
- return NULL;
- }
---- vbox_module.orig/vboxguest/VBoxGuest-linux.c 2018-02-18 16:42:28.000000000 +0000
-+++ vbox_module/vboxguest/VBoxGuest-linux.c 2018-02-18 16:54:36.793049118 +0000
-@@ -1058,7 +1058,7 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-
- /** log and dbg_log parameter setter. */
--static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
- {
- if (g_fLoggerCreated)
- {
-@@ -1073,7 +1073,7 @@
- }
-
- /** log and dbg_log parameter getter. */
--static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1084,7 +1084,7 @@
-
-
- /** log and dbg_log_flags parameter setter. */
--static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
- {
- if (g_fLoggerCreated)
- {
-@@ -1098,7 +1098,7 @@
- }
-
- /** log and dbg_log_flags parameter getter. */
--static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1109,7 +1109,7 @@
-
-
- /** log and dbg_log_dest parameter setter. */
--static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
- {
- if (g_fLoggerCreated)
- {
-@@ -1123,7 +1123,7 @@
- }
-
- /** log and dbg_log_dest parameter getter. */
--static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1134,7 +1134,7 @@
-
-
- /** r3_log_to_host parameter setter. */
--static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
- {
- if ( pszValue == NULL
- || *pszValue == '\0'
-@@ -1152,7 +1152,7 @@
- }
-
- /** r3_log_to_host parameter getter. */
--static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
- {
- strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
- return strlen(pszBuf);
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
similarity index 91%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
index c018b789f2..e00db4d7e0 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
@@ -15,11 +15,8 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
file://Makefile.utils \
"
-# For default linux-yocto 4.15
-SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff"
-
-SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
-SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7"
+SRC_URI[md5sum] = "e731ea9c5c31096ec4c2a3bfba26665c"
+SRC_URI[sha256sum] = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"
S = "${WORKDIR}/vbox_module"
--
2.15.1
prev parent reply other threads:[~2018-03-02 0:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-24 10:51 [meta-oe][PATCH] vboxguestdrivers: upgrade to 5.2.6 Martin Jansa
2018-02-24 15:57 ` Khem Raj
2018-02-24 16:28 ` Martin Jansa
2018-02-26 0:24 ` akuster808
2018-02-26 5:37 ` zboszor
2018-03-01 9:45 ` Martin Jansa
2018-03-01 9:39 ` [meta-oe][PATCHv2] vboxguestdrivers: upgrade to 5.2.8 Martin Jansa
2018-03-02 0:42 ` Martin Jansa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302004208.1841-1-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox