summaryrefslogtreecommitdiff
path: root/v4l/scripts/do_merge.pl
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-09 06:24:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-09 06:24:32 -0300
commit07aa0071b7731c08909ed2ea7ab99a62fa934ff0 (patch)
treeb3d5557c8270425dd0a5fc734516159e9eaf63db /v4l/scripts/do_merge.pl
parentd54da4a86ac71c49e0b100b4911a7695d37e93df (diff)
downloadmediapointer-dvb-s2-07aa0071b7731c08909ed2ea7ab99a62fa934ff0.tar.gz
mediapointer-dvb-s2-07aa0071b7731c08909ed2ea7ab99a62fa934ff0.tar.bz2
Kbuild: add a new target to check for section mismatches
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/scripts/do_merge.pl')
-rwxr-xr-xv4l/scripts/do_merge.pl5
1 files changed, 4 insertions, 1 deletions
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";