diff mbox

btrfs-progs: bump to version 3.14.2

Message ID 1403035155-24320-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Commit ed84ec6d6e9684a7ec9af9846bcf1ba20c19751d
Headers show

Commit Message

Gustavo Zacarias June 17, 2014, 7:59 p.m. UTC 
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../btrfs-progs-0001-no-documentation.patch           | 19 +++++++++++++++++++
 package/btrfs-progs/btrfs-progs.mk                    |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 package/btrfs-progs/btrfs-progs-0001-no-documentation.patch

Comments

Peter Korsgaard June 18, 2014, 11:57 a.m. UTC | #1 
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.
diff mbox

Patch

diff --git a/package/btrfs-progs/btrfs-progs-0001-no-documentation.patch b/package/btrfs-progs/btrfs-progs-0001-no-documentation.patch
new file mode 100644
index 0000000..cdda671
--- /dev/null
+++ b/package/btrfs-progs/btrfs-progs-0001-no-documentation.patch
@@ -0,0 +1,19 @@ 
+Disable documentation build/install, it needs asciidoc
+and we don't use it anyway.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura btrfs-progs-v3.14.2.orig/Makefile btrfs-progs-v3.14.2/Makefile
+--- btrfs-progs-v3.14.2.orig/Makefile	2014-05-29 21:56:59.000000000 -0300
++++ btrfs-progs-v3.14.2/Makefile	2014-06-17 16:53:29.404520306 -0300
+@@ -57,8 +57,8 @@
+ btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype
+ 
+ SUBDIRS =
+-BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) build-Documentation
+-INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) install-Documentation
++BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS))
++INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS))
+ CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS))
+ 
+ .PHONY: $(SUBDIRS)
diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk
index 415ded2..9ee44ad 100644
--- a/package/btrfs-progs/btrfs-progs.mk
+++ b/package/btrfs-progs/btrfs-progs.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-BTRFS_PROGS_VERSION = 3.14.1
+BTRFS_PROGS_VERSION = 3.14.2
 BTRFS_PROGS_SITE = https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs
 BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz
 BTRFS_PROGS_DEPENDENCIES = acl attr e2fsprogs lzo util-linux zlib