diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 5 | ||||
| -rwxr-xr-x | v4l/scripts/do_merge.pl | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index dc0cfcaa6..23ae32cad 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -45,6 +45,11 @@ default:: config-compat.h Makefile.media links oss firmware ./scripts/rmmod.pl check # $(MAKE) checkpatch +mismatch:: config-compat.h Makefile.media links oss firmware + @echo Kernel build directory is $(OUTDIR) + $(MAKE) -Wfatal-errors -C $(OUTDIR) SUBDIRS=$(PWD) $(MYCFLAGS) CONFIG_DEBUG_SECTION_MISMATCH=y modules + ./scripts/rmmod.pl check + firmware:: $(MAKE) -C firmware prep $(MAKE) -C firmware diff --git a/v4l/scripts/do_merge.pl b/v4l/scripts/do_merge.pl index 0a4433a21..1a6bbb1ee 100755 --- a/v4l/scripts/do_merge.pl +++ b/v4l/scripts/do_merge.pl @@ -153,7 +153,10 @@ if ($n_heads == 2) { # Test resulting tree print "Testing if the build didn't break compilation. Only errors and warnings will be displayed. Please wait.\n"; -$ret = system ('make all|egrep -v "^\s*CC"|egrep -v "^\s*LD"'); +$ret = system ('make allmodconfig'); +if (!ret) { + $ret = system ('make mismatch|egrep -v "^\s*CC"|egrep -v "^\s*LD"'); +} if ($ret) { print "Build failed. Can't procceed.\n"; |