summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 22:30:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-07 10:57:47 +0100
commitdea71b05021c54a4caa227cfcb3d4c024effdf15 (patch)
treeb28c9bf8db369766e0128e4cad302ec033b9eeee /meta
parentc47c0e0eb3d5fa63e8f44e820aff70ab23b6c036 (diff)
downloadpoky-dea71b05021c54a4caa227cfcb3d4c024effdf15.tar.gz
btrfs-tools: Fix manpage creation directory
(From OE-Core rev: 0bfedd0d9d59ad6184e242d85cdeca7297e90fa6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch31
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb3
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 @@
1Upstream-Status: Pending
2
3Allow mandir to be set from the environment, fixing the following packaging warnings:
4
5WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package:
6WARNING: /usr/man/man8/btrfs-show.8.gz
7WARNING: /usr/man/man8/btrfs-image.8.gz
8WARNING: /usr/man/man8/btrfsctl.8.gz
9WARNING: /usr/man/man8/btrfs.8.gz
10WARNING: /usr/man/man8/btrfsck.8.gz
11WARNING: /usr/man/man8/mkfs.btrfs.8.gz
12
13RP - 5/7/2011
14
15Index: git/man/Makefile
16===================================================================
17--- git.orig/man/Makefile 2011-07-05 22:03:58.949919067 +0100
18+++ git/man/Makefile 2011-07-05 22:04:07.789919856 +0100
19@@ -2,9 +2,9 @@
20 INSTALL= install
21
22 prefix ?= /usr/local
23-bindir = $(prefix)/bin
24-mandir = $(prefix)/man
25-man8dir = $(mandir)/man8
26+bindir ?= $(prefix)/bin
27+mandir ?= $(prefix)/man
28+man8dir ?= $(mandir)/man8
29
30 MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \
31 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
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18PR = "r0" 18PR = "r1"
19 19
20SRC_URI += "file://upstream-tmp/0001-Btrfs-progs-add-a-btrfs-select-super-command-to-over.patch \ 20SRC_URI += "file://upstream-tmp/0001-Btrfs-progs-add-a-btrfs-select-super-command-to-over.patch \
21 file://upstream-tmp/0002-Btrfs-progs-use-safe-string-manipulation-functions.patch \ 21 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
40 file://debian/01-labels.patch \ 40 file://debian/01-labels.patch \
41 file://debian/02-ftbfs.patch \ 41 file://debian/02-ftbfs.patch \
42 file://fix_use_of_gcc.patch \ 42 file://fix_use_of_gcc.patch \
43 file://weak-defaults.patch \
43 " 44 "
44 45
45SRC_URI[md5sum] = "78b1700d318de8518abfaab71f99a885" 46SRC_URI[md5sum] = "78b1700d318de8518abfaab71f99a885"