btrfs-tools: Fix manpage creation directory

(From OE-Core rev: 0bfedd0d9d59ad6184e242d85cdeca7297e90fa6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 33 insertions, 1 deletions

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
new file mode 100644
index 0000000000..9ca9fca3ee
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
@@ -0,0 +1,31 @@
+Upstream-Status: Pending
+
+Allow mandir to be set from the environment, fixing the following packaging warnings:
+
+WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package:
+WARNING:   /usr/man/man8/btrfs-show.8.gz
+WARNING:   /usr/man/man8/btrfs-image.8.gz
+WARNING:   /usr/man/man8/btrfsctl.8.gz
+WARNING:   /usr/man/man8/btrfs.8.gz
+WARNING:   /usr/man/man8/btrfsck.8.gz
+WARNING:   /usr/man/man8/mkfs.btrfs.8.gz
+
+RP - 5/7/2011
+
+Index: git/man/Makefile
+===================================================================
+--- git.orig/man/Makefile       2011-07-05 22:03:58.949919067 +0100
++++ git/man/Makefile    2011-07-05 22:04:07.789919856 +0100
+@@ -2,9 +2,9 @@
+ INSTALL= install
+ 
+ prefix ?= /usr/local
+-bindir = $(prefix)/bin
+-mandir = $(prefix)/man
+-man8dir = $(mandir)/man8
++bindir ?= $(prefix)/bin
++mandir ?= $(prefix)/man
++man8dir ?= $(mandir)/man8
+ 
+ MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \
+           btrfs-show.8.gz btrfs.8.gz
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index 312dff30f3..a5c556dc31 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unsta
 
 S = "${WORKDIR}/git"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://upstream-tmp/0001-Btrfs-progs-add-a-btrfs-select-super-command-to-over.patch \
             file://upstream-tmp/0002-Btrfs-progs-use-safe-string-manipulation-functions.patch \
@@ -40,6 +40,7 @@ SRC_URI += "file://upstream-tmp/0001-Btrfs-progs-add-a-btrfs-select-super-comman
             file://debian/01-labels.patch \
             file://debian/02-ftbfs.patch \
             file://fix_use_of_gcc.patch \
+            file://weak-defaults.patch \
                 "
 
 SRC_URI[md5sum] = "78b1700d318de8518abfaab71f99a885"