apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Merge of xfs-cmds-melb:slinx:19608a by kenmcd.
This commit is contained in:
Nathan Scott
2004-09-30 14:48:51 +00:00
parent 8715fe28cd
commit d0b5d2750b
5 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aclocal.m4
Vendored
+5 -4
View File
@@ -186,13 +186,14 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
])
AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
[ AC_CHECK_HEADERS(uuid.h)
if test $ac_cv_header_uuid_h = no; then
AC_CHECK_HEADERS(uuid/uuid.h,, [
[ AC_CHECK_HEADERS([uuid.h sys/uuid.h uuid/uuid.h])
if test $ac_cv_header_uuid_h = no -a \
$ac_cv_header_sys_uuid_h = no -a \
$ac_cv_header_uuid_uuid_h = no; then
echo
echo 'FATAL ERROR: could not find a valid UUID header.'
echo 'Install the Universally Unique Identifiers development package.'
exit 1])
exit 1
fi
])
m4/Makefile
+1
View File
@@ -40,6 +40,7 @@ LSRCFILES = \
package_attrdev.m4 \
package_dmapidev.m4 \
package_globals.m4 \
package_libcdev.m4 \
package_ncurses.m4 \
package_pthread.m4 \
package_types.m4 \
m4/package_libcdev.m4
+67
View File
@@ -0,0 +1,67 @@
#
# Check if we have a working fadvise system call
#
AC_DEFUN([AC_HAVE_FADVISE],
[ AC_MSG_CHECKING([for fadvise ])
AC_TRY_COMPILE([
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#include <fcntl.h>
], [
posix_fadvise(0, 1, 0, 0);
], have_fadvise=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
AC_SUBST(have_fadvise)
])
#
# Check if we have a working madvise system call
#
AC_DEFUN([AC_HAVE_MADVISE],
[ AC_MSG_CHECKING([for madvise ])
AC_TRY_COMPILE([
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#include <sys/mman.h>
], [
posix_madvise(0, 0, MADV_NORMAL);
], have_madvise=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
AC_SUBST(have_madvise)
])
#
# Check if we have a working mincore system call
#
AC_DEFUN([AC_HAVE_MINCORE],
[ AC_MSG_CHECKING([for mincore ])
AC_TRY_COMPILE([
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#include <sys/mman.h>
], [
mincore(0, 0, 0);
], have_mincore=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
AC_SUBST(have_mincore)
])
#
# Check if we have a working sendfile system call
#
AC_DEFUN([AC_HAVE_SENDFILE],
[ AC_MSG_CHECKING([for sendfile ])
AC_TRY_COMPILE([
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#include <sys/sendfile.h>
], [
sendfile(0, 0, 0, 0);
], have_sendfile=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
AC_SUBST(have_sendfile)
])
m4/package_uuiddev.m4
+5 -4
View File
@@ -1,11 +1,12 @@
AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
[ AC_CHECK_HEADERS(uuid.h)
if test $ac_cv_header_uuid_h = no; then
AC_CHECK_HEADERS(uuid/uuid.h,, [
[ AC_CHECK_HEADERS([uuid.h sys/uuid.h uuid/uuid.h])
if test $ac_cv_header_uuid_h = no -a \
$ac_cv_header_sys_uuid_h = no -a \
$ac_cv_header_uuid_uuid_h = no; then
echo
echo 'FATAL ERROR: could not find a valid UUID header.'
echo 'Install the Universally Unique Identifiers development package.'
exit 1])
exit 1
fi
])
tools/srcdiff
+5 -2
View File
@@ -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