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

fstests: remove libattr dependencies

Browse Source 
Now that we don't have any libattr dependencies anymore, get rid of all
the build system hooks.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2021-03-08 20:39:40 -08:00
committed by Eryu Guan
parent f5c3de7d2f
commit 69a5de8289
8 changed files with 3 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README
+2 -2
View File
@@ -6,14 +6,14 @@ _______________________
- install prerequisite packages
For example, for Ubuntu:
sudo apt-get install xfslibs-dev uuid-dev libtool-bin \
e2fsprogs automake gcc libuuid1 quota attr libattr1-dev make \
e2fsprogs automake gcc libuuid1 quota attr make \
libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench \
uuid-runtime python sqlite3 liburing-dev
For Fedora, RHEL, or CentOS:
yum install acl attr automake bc dbench dump e2fsprogs fio \
gawk gcc indent libtool lvm2 make psmisc quota sed \
xfsdump xfsprogs \
libacl-devel libattr-devel libaio-devel libuuid-devel \
libacl-devel libaio-devel libuuid-devel \
xfsprogs-devel btrfs-progs-devel python sqlite liburing-devel
(Older distributions may require xfsprogs-qa-devel as well.)
(Note that for RHEL and CentOS, you may need the EPEL repo.)
build/rpm/xfstests.spec.in
+1 -1
View File
@@ -6,7 +6,7 @@ Distribution: @pkg_distribution@
Packager: Silicon Graphics, Inc. <http://www.sgi.com/>
BuildRoot: @build_root@
BuildRequires: autoconf, xfsprogs-devel, e2fsprogs-devel
BuildREquires: libacl-devel, libattr-devel, libaio-devel
BuildREquires: libacl-devel, libaio-devel
Requires: bash, xfsprogs, xfsdump, perl, acl, attr, bind-utils
Requires: bc, indent, quota
Source: @pkg_name@-@pkg_version@.src.tar.gz
configure.ac
-4
View File
@@ -49,11 +49,7 @@ AC_PACKAGE_WANT_XLOG_ASSIGN_LSN
AC_PACKAGE_NEED_XFS_XQM_H
AC_PACKAGE_NEED_XFSCTL_MACRO
AC_PACKAGE_NEED_XFS_HANDLE_H
AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
AC_PACKAGE_NEED_ATTRIBUTES_H
AC_PACKAGE_WANT_ATTRLIST_LIBATTR
AC_PACKAGE_NEED_ATTRSET_LIBATTR
AC_PACKAGE_NEED_SYS_ACL_H
AC_PACKAGE_NEED_ACL_LIBACL_H
include/builddefs.in
-2
View File
@@ -20,7 +20,6 @@ HAVE_LIBXFS = @have_libxfs@
HAVE_XLOG_ASSIGN_LSN = @have_xlog_assign_lsn@
LIBXFS = @libxfs@
LIBACL = @libacl@
LIBATTR = @libattr@
LIBGDBM = @libgdbm@
LIBUUID = @libuuid@
LIBHANDLE = @libhdl@
@@ -65,7 +64,6 @@ HAVE_URING = @have_uring@
HAVE_FALLOCATE = @have_fallocate@
HAVE_OPEN_BY_HANDLE_AT = @have_open_by_handle_at@
HAVE_DMAPI = @have_dmapi@
HAVE_ATTR_LIST = @have_attr_list@
HAVE_FIEMAP = @have_fiemap@
HAVE_FALLOCATE = @have_fallocate@
HAVE_COPY_FILE_RANGE = @have_copy_file_range@
ltp/Makefile
-5
View File
@@ -13,11 +13,6 @@ LDIRT = $(TARGETS)
LCFLAGS = -DXFS
LCFLAGS += -I$(TOPDIR)/src #Used for including $(TOPDIR)/src/global.h
ifeq ($(HAVE_ATTR_LIST), true)
LCFLAGS += -DHAVE_ATTR_LIST
LLDLIBS += $(LIBATTR)
endif
ifeq ($(HAVE_AIO), true)
TARGETS += aio-stress
LCFLAGS += -DAIO
ltp/fsstress.c
-6
View File
@@ -14,15 +14,9 @@
#ifdef HAVE_BTRFSUTIL_H
#include <btrfsutil.h>
#endif
#ifdef HAVE_ATTR_ATTRIBUTES_H
#include <attr/attributes.h>
#endif
#ifdef HAVE_LINUX_FIEMAP_H
#include <linux/fiemap.h>
#endif
#ifndef HAVE_ATTR_LIST
#define attr_list(path, buf, size, flags, cursor) (errno = -ENOSYS, -1)
#endif
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
m4/Makefile
-1
View File
@@ -10,7 +10,6 @@ LSRCFILES = \
package_acldev.m4 \
package_aiodev.m4 \
package_gdbmdev.m4 \
package_attrdev.m4 \
package_dmapidev.m4 \
package_globals.m4 \
package_libcdev.m4 \
m4/package_attrdev.m4
-54
View File
@@ -1,54 +0,0 @@
AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
[ AC_CHECK_HEADERS([attr/error_context.h])
if test "$ac_cv_header_attr_error_context_h" != "yes"; then
echo
echo 'FATAL ERROR: attr/error_context.h does not exist.'
echo 'Install the extended attributes (attr) development package.'
echo 'Alternatively, run "make install-dev" from the attr source.'
exit 1
fi
])
AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_H],
[ have_attributes_h=false
AC_CHECK_HEADERS([attr/attributes.h sys/attributes.h], [have_attributes_h=true], )
if test "$have_attributes_h" = "false"; then
echo
echo 'FATAL ERROR: attributes.h does not exist.'
echo 'Install the extended attributes (attr) development package.'
echo 'Alternatively, run "make install-dev" from the attr source.'
exit 1
fi
])
AC_DEFUN([AC_PACKAGE_WANT_ATTRLIST_LIBATTR],
[ AC_CHECK_LIB(attr, attr_list, [have_attr_list=true], [have_attr_list=false])
AC_SUBST(have_attr_list)
])
AC_DEFUN([AC_PACKAGE_NEED_ATTRSET_LIBATTR],
[ AC_CHECK_LIB(attr, attr_set,, [
echo
echo 'FATAL ERROR: could not find a valid Extended Attributes library.'
echo 'Install the extended attributes (attr) development package.'
echo 'Alternatively, run "make install-lib" from the attr source.'
exit 1
])
libattr="-lattr"
test -f ${libexecdir}${libdirsuffix}/libattr.la && \
libattr="${libexecdir}${libdirsuffix}/libattr.la"
AC_SUBST(libattr)
])
AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_MACROS],
[ AC_MSG_CHECKING([macros in attr/attributes.h])
AC_TRY_LINK([
#include <sys/types.h>
#include <attr/attributes.h>],
[ int x = ATTR_SECURE; ], [ echo ok ], [
echo
echo 'FATAL ERROR: could not find a current attributes header.'
echo 'Upgrade the extended attributes (attr) development package.'
echo 'Alternatively, run "make install-dev" from the attr source.'
exit 1 ])
])