Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 009976d1b9f3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8238393becfe
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 9, 2019

  1. xfstests: fix build (see #53716) by applying upstream patches

    @pSub
    pSub committed Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    GPG key ID: C899ACE7E2322852
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ac1d0c4 View commit details

Commits on Mar 15, 2019

  1. Merge pull request #57165 from NixOS/fix-xfstests 

    Fix build of xfstests (19.03)
    @pSub
    pSub authored Mar 15, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8238393 View commit details
Showing with 110 additions and 1 deletion.
  1. +3 −1 pkgs/tools/misc/xfstests/default.nix
  2. +107 −0 pkgs/tools/misc/xfstests/xattr.patch
4 changes: 3 additions & 1 deletion pkgs/tools/misc/xfstests/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,9 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
enableParallelBuilding = true;

patchPhase = ''
patches = [ ./xattr.patch ];

postPatch = ''
# Patch the destination directory
sed -i include/builddefs.in -e "s|^PKG_LIB_DIR\s*=.*|PKG_LIB_DIR=$out/lib/xfstests|"
107 changes: 107 additions & 0 deletions pkgs/tools/misc/xfstests/xattr.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 1bffa115..edbb3f2f 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -10,9 +10,6 @@
#include <stddef.h>
#include "global.h"

-#ifdef HAVE_ATTR_XATTR_H
-#include <attr/xattr.h>
-#endif
#ifdef HAVE_ATTR_ATTRIBUTES_H
#include <attr/attributes.h>
#endif
diff --git a/src/t_immutable.c b/src/t_immutable.c
index 9a4e0169..eadef78f 100644
--- a/src/t_immutable.c
+++ b/src/t_immutable.c
@@ -23,7 +23,7 @@
#include <grp.h>
#include <libgen.h>
#include <sys/acl.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
#include <linux/fs.h>
#include <linux/magic.h>
#include <xfs/xfs.h>
diff --git a/configure.ac b/configure.ac
index 57092f1c..63ea032d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,6 @@ AC_PACKAGE_NEED_XFSCTL_MACRO
AC_PACKAGE_NEED_XFS_HANDLE_H

AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
-AC_PACKAGE_NEED_ATTR_XATTR_H
AC_PACKAGE_NEED_ATTRIBUTES_H
AC_PACKAGE_WANT_ATTRLIST_LIBATTR
AC_PACKAGE_NEED_GETXATTR_LIBATTR
diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4
index 12251ceb..9a82f241 100644
--- a/m4/package_attrdev.m4
+++ b/m4/package_attrdev.m4
@@ -1,14 +1,3 @@
-AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
- [ AC_CHECK_HEADERS([attr/xattr.h])
- if test "$ac_cv_header_attr_xattr_h" != "yes"; then
- echo
- echo 'FATAL ERROR: attr/xattr.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_ATTR_ERROR_H],
[ AC_CHECK_HEADERS([attr/error_context.h])
if test "$ac_cv_header_attr_error_context_h" != "yes"; then
@@ -37,20 +26,6 @@ AC_DEFUN([AC_PACKAGE_WANT_ATTRLIST_LIBATTR],
AC_SUBST(have_attr_list)
])

-AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR],
- [ AC_CHECK_LIB(attr, getxattr,, [
- 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_ATTRGET_LIBATTR],
[ AC_CHECK_LIB(attr, attr_get,, [
echo
diff --git a/configure.ac b/configure.ac
index 63ea032d..aede4f59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AC_PACKAGE_NEED_XFS_HANDLE_H
AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
AC_PACKAGE_NEED_ATTRIBUTES_H
AC_PACKAGE_WANT_ATTRLIST_LIBATTR
-AC_PACKAGE_NEED_GETXATTR_LIBATTR
+AC_PACKAGE_NEED_ATTRSET_LIBATTR

AC_PACKAGE_NEED_SYS_ACL_H
AC_PACKAGE_NEED_ACL_LIBACL_H
diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4
index 9a82f241..d994cfc2 100644
--- a/m4/package_attrdev.m4
+++ b/m4/package_attrdev.m4
@@ -26,8 +26,8 @@ AC_DEFUN([AC_PACKAGE_WANT_ATTRLIST_LIBATTR],
AC_SUBST(have_attr_list)
])

-AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR],
- [ AC_CHECK_LIB(attr, attr_get,, [
+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.'