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

btrfs-progs: bump to 3.19.1

Browse source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2015-03-29 15:47:58 +02:00
parent 70344eea14
commit e6825ac677
2 changed files with 56 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
utils/btrfs-progs/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=btrfs-progs PKG_NAME:=btrfs-progs
PKG_VERSION:=3.17.3 PKG_VERSION:=3.19.1
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/ PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs/
PKG_MD5SUM:=6716b4b109dd909af63ab3becbad67a6 PKG_MD5SUM:=ec3b3c99df18633ddc9e41f0680c5a51
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
@ -24,6 +24,8 @@ PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=libacl PKG_BUILD_DEPENDS:=libacl
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/btrfs-progs define Package/btrfs-progs
@ -46,15 +48,9 @@ progs = btrfs btrfsck btrfs-convert btrfs-debug-tree btrfs-find-root \
btrfs-image btrfs-map-logical btrfs-show-super btrfstune \ btrfs-image btrfs-map-logical btrfs-show-super btrfstune \
btrfs-zero-log fsck.btrfs mkfs.btrfs btrfs-zero-log fsck.btrfs mkfs.btrfs
CONFIGURE_ARGS += \
MAKE_FLAGS+=\ --disable-backtrace \
CC="$(TARGET_CC)" \ --disable-documentation
CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
prefix=/usr \
DESTDIR=$(PKG_INSTALL_DIR) \
DISABLE_BACKTRACE=1 \
DISABLE_DOCUMENTATION=1
define Package/btrfs-progs/install define Package/btrfs-progs/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib

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

@ -1,16 +1,20 @@
--- a/mkfs.c Index: btrfs-progs-v3.19.1/mkfs.c
+++ b/mkfs.c ===================================================================
@@ -34,7 +34,7 @@ --- btrfs-progs-v3.19.1.orig/mkfs.c
+++ btrfs-progs-v3.19.1/mkfs.c
@@ -31,7 +31,7 @@
#include <getopt.h> #include <getopt.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <ctype.h> #include <ctype.h>
-#include <sys/xattr.h> -#include <sys/xattr.h>
+#include <attr/xattr.h> +#include <attr/xattr.h>
#include <limits.h>
#include <linux/limits.h>
#include <blkid/blkid.h> #include <blkid/blkid.h>
#include <ftw.h> Index: btrfs-progs-v3.19.1/props.c
#include "ctree.h" ===================================================================
--- a/props.c --- btrfs-progs-v3.19.1.orig/props.c
+++ b/props.c +++ btrfs-progs-v3.19.1/props.c
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -20,9 +24,11 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
--- a/cmds-receive.c Index: btrfs-progs-v3.19.1/cmds-receive.c
+++ b/cmds-receive.c ===================================================================
@@ -39,7 +39,7 @@ --- 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/ioctl.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
@ -31,9 +37,11 @@
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include "ctree.h" #include "ctree.h"
--- a/cmds-restore.c Index: btrfs-progs-v3.19.1/cmds-restore.c
+++ b/cmds-restore.c ===================================================================
@@ -34,7 +34,7 @@ --- 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 <regex.h>
#include <getopt.h> #include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
@ -42,14 +50,30 @@
#include "ctree.h" #include "ctree.h"
#include "disk-io.h" #include "disk-io.h"
--- a/Makefile Index: btrfs-progs-v3.19.1/Makefile.in
+++ b/Makefile ===================================================================
@@ -26,7 +26,7 @@ TESTS = fsck-tests.sh convert-tests.sh --- btrfs-progs-v3.19.1.orig/Makefile.in
INSTALL = install +++ btrfs-progs-v3.19.1/Makefile.in
prefix ?= /usr/local @@ -21,7 +21,7 @@ CFLAGS = @CFLAGS@ \
bindir = $(prefix)/bin LDFLAGS = @LDFLAGS@ \
-lib_LIBS = -luuid -lblkid -lm -lz -llzo2 -L. -rdynamic
+lib_LIBS = -lattr -luuid -lblkid -lm -lz -llzo2 -L.
libdir ?= $(prefix)/lib -LIBS = @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
incdir = $(prefix)/include/btrfs +LIBS = @ATTR_LIBS@ @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread
LIBS = $(lib_LIBS) $(libs_static) 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])