diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-support/vboxguestdrivers | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/vboxguestdrivers')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch | 33 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb (renamed from meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.18.bb) | 8 |
2 files changed, 5 insertions, 36 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch deleted file mode 100644 index 93eaa3d6c..000000000 --- a/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/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.18.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb index 2a4cc387f..e394f34c7 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb @@ -13,10 +13,9 @@ 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] = "c9c2f162ac5f99d28d8c0ca43b19ed01" +SRC_URI[sha256sum] = "5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4" S = "${WORKDIR}/vbox_module" @@ -25,6 +24,9 @@ export BUILD_TARGET_ARCH_x86-64="amd64" EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'" +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + addtask export_sources before do_patch after do_unpack do_export_sources() { |