From a9715573c0e5946a35beaa1b928d9ea95bc3833d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 29 Mar 2017 10:38:35 +0200 Subject: vboxguestdrivers: make sure that do_compile fails when some module failed to build * otherwise we get the failure from do_install with useless log: DEBUG: Executing shell function do_install install: cannot stat 'vboxsf.ko': No such file or directory WARNING: exit code 1 from a shell command. * instead of the real issue like 5.1.14 currently has with default linux-yocto version: CC [M] qemux86-oe-linux/vboxguestdrivers/5.1.14-r0/vbox_module/vboxsf/lnkops.o qemux86-oe-linux/vboxguestdrivers/5.1.14-r0/vbox_module/vboxsf/lnkops.c:93:23: error: 'generic_readlink' undeclared here (not in a function) .readlink = generic_readlink, ^~~~~~~~~~~~~~~~ Signed-off-by: Martin Jansa --- meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb | 4 ++++ meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.14.bb | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'meta-oe/recipes-support/vboxguestdrivers') diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb index f8a24a508..0c08d97f8 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb @@ -41,6 +41,10 @@ do_export_sources() { # compile and install mount utility do_compile_append() { 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" + exit 1 + fi } module_do_install() { diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.14.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.14.bb index dde5b0b20..c27791e95 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.14.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.14.bb @@ -41,6 +41,10 @@ do_export_sources() { # compile and install mount utility do_compile_append() { 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" + exit 1 + fi } module_do_install() { -- cgit v1.2.3-54-g00ecf