Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

btrfs-progs: remove no longer needed patch

Browse source 
xattr.h header location no longer needs to be patched.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2015-11-22 01:19:37 +01:00
parent 99526baae2
commit 021c3e1198
2 changed files with 1 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/btrfs-progs/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=btrfs-progs
PKG_VERSION:=3.19.1
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/

79
utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch
View file

@ -1,79 +0,0 @@
Index: btrfs-progs-v3.19.1/mkfs.c
===================================================================
--- btrfs-progs-v3.19.1.orig/mkfs.c
+++ btrfs-progs-v3.19.1/mkfs.c
@@ -31,7 +31,7 @@
#include <getopt.h>
#include <uuid/uuid.h>
#include <ctype.h>
-#include <sys/xattr.h>
+#include <attr/xattr.h>
#include <limits.h>
#include <linux/limits.h>
#include <blkid/blkid.h>
Index: btrfs-progs-v3.19.1/props.c
===================================================================
--- btrfs-progs-v3.19.1.orig/props.c
+++ btrfs-progs-v3.19.1/props.c
@@ -17,7 +17,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/types.h>
-#include <sys/xattr.h>
+#include <attr/xattr.h>
#include <fcntl.h>
#include <unistd.h>
Index: btrfs-progs-v3.19.1/cmds-receive.c
===================================================================
--- btrfs-progs-v3.19.1.orig/cmds-receive.c
+++ btrfs-progs-v3.19.1/cmds-receive.c
@@ -34,7 +34,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <sys/xattr.h>
+#include <attr/xattr.h>
#include <uuid/uuid.h>
#include "ctree.h"
Index: btrfs-progs-v3.19.1/cmds-restore.c
===================================================================
--- btrfs-progs-v3.19.1.orig/cmds-restore.c
+++ btrfs-progs-v3.19.1/cmds-restore.c
@@ -32,7 +32,7 @@
#include <regex.h>
#include <getopt.h>
#include <sys/types.h>
-#include <sys/xattr.h>
+#include <attr/xattr.h>
#include "ctree.h"
#include "disk-io.h"
Index: btrfs-progs-v3.19.1/Makefile.in
===================================================================
--- btrfs-progs-v3.19.1.orig/Makefile.in
+++ btrfs-progs-v3.19.1/Makefile.in
@@ -21,7 +21,7 @@ CFLAGS = @CFLAGS@ \
LDFLAGS = @LDFLAGS@ \
-rdynamic
-LIBS = @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
+LIBS = @ATTR_LIBS@ @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
LIBBTRFS_LIBS = $(LIBS)
# Static compilation flags
Index: btrfs-progs-v3.19.1/configure.ac
===================================================================
--- btrfs-progs-v3.19.1.orig/configure.ac
+++ btrfs-progs-v3.19.1/configure.ac
@@ -115,6 +115,9 @@ dnl
dnl The default PKG_CHECK_MODULES() action-if-not-found is end the
dnl execution with error. The static libs are optional.
+PKG_CHECK_MODULES(ATTR, [libattr])
+PKG_STATIC(BLKID_LIBS_STATIC, [libattr])
+
PKG_CHECK_MODULES(BLKID, [blkid])
PKG_STATIC(BLKID_LIBS_STATIC, [blkid])