mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Keep userspace packaging in sync; update srcdiff to grok moved dmapi source.
Merge of xfs-cmds-melb:slinx:19608a by kenmcd.
This commit is contained in:
+5
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user