Keep userspace packaging in sync; update srcdiff to grok moved dmapi source.

[xfstests-dev.git] / tools / srcdiff

diff --git a/tools/srcdiff b/tools/srcdiff
index e825a6047e952ce091ecc79a46b60452806b0077..5adebbad8357baff8180978bd3a843398d4ea884 100755 (executable)
--- a/tools/srcdiff
+++ b/tools/srcdiff
@@ -25,7 +25,9 @@ use strict;
 
 die "WORKAREA not set" unless defined $ENV{'WORKAREA'};
 die "KWORKAREA not set" unless defined $ENV{'KWORKAREA'};
+die "DMWORKAREA not set" unless defined $ENV{'DMWORKAREA'};
 chdir $ENV{'WORKAREA'};
+my $dmworkarea = $ENV{'DMWORKAREA'};
 my $kworkarea = $ENV{'KWORKAREA'};
 my $xdiff = $ENV{'XDIFF'};
 my $quiet = 0;
@@ -35,6 +37,7 @@ if ( ! -f "$kworkarea/xfs_fs.h" ) {
        $kworkarea .= '/fs/xfs';
        die "Cannot find XFS in KWORKAREA" unless -f "$kworkarea/xfs_fs.h";
 }
+die "Cannot find DMAPI in DMWORKAREA" unless -f "$dmworkarea/dmapi.h";
 
 foreach (@ARGV) {
        if (/^-q$/) {
@@ -109,8 +112,8 @@ print "\n=== Checking headers ===\n";
 foreach (@difflist) {
        straightdiff $_, 'xfsprogs/include', "$kworkarea";
 }
-straightdiff 'dmapi_kern.h', 'dmapi/include', "$kworkarea/dmapi";
-straightdiff 'dmapi.h', 'dmapi/include', "$kworkarea/dmapi";
+straightdiff 'dmapi_kern.h', 'dmapi/include', "$dmworkarea";
+straightdiff 'dmapi.h', 'dmapi/include', "$dmworkarea";
 
 # 
 # setstate