diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch | 33 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb (renamed from external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.18.bb) | 15 |
2 files changed, 9 insertions, 39 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch b/external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch deleted file mode 100644 index 93eaa3d6..00000000 --- a/external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Fix build failure with new kernel 4.18 -Author: Gianfranco Costamagna <locutusofborg@debian.org> - -Upstream-Status:Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: vbox_module/vboxsf/utils.c -=================================================================== ---- vbox_module.orig/vboxsf/utils.c -+++ vbox_module/vboxsf/utils.c -@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM - RTTimeSpecSetNano(ts, t); - } - #else /* >= 2.6.0 */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) - static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts) -+#else -+static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts) -+#endif - { - int64_t t = RTTimeSpecGetNano(ts); - int64_t nsec; -@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc - tv->tv_nsec = nsec; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) - static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv) -+#else -+static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv) -+#endif - { - int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000; - RTTimeSpecSetNano(ts, t); diff --git a/external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.18.bb b/external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb index 2a4cc387..89b1ee11 100644 --- a/external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.18.bb +++ b/external/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb @@ -13,19 +13,21 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://kernel-4.18.patch \ " -SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce" -SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf" +SRC_URI[md5sum] = "fe6328d22dfb20ea372daa4b58b12374" +SRC_URI[sha256sum] = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f" S = "${WORKDIR}/vbox_module" export BUILD_TARGET_ARCH="${ARCH}" export BUILD_TARGET_ARCH_x86-64="amd64" -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'" +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" -addtask export_sources before do_patch after do_unpack +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + +addtask export_sources after do_patch before do_configure do_export_sources() { mkdir -p "${S}" @@ -48,7 +50,8 @@ do_configure_prepend() { } # compile and install mount utility -do_compile_append() { +do_compile() { + oe_runmake all oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then echo "ERROR: One of vbox*.ko modules wasn't built" |