diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 22:30:12 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-07 10:57:47 +0100 |
| commit | dea71b05021c54a4caa227cfcb3d4c024effdf15 (patch) | |
| tree | b28c9bf8db369766e0128e4cad302ec033b9eeee /meta/recipes-devtools/btrfs-tools | |
| parent | c47c0e0eb3d5fa63e8f44e820aff70ab23b6c036 (diff) | |
| download | ast2050-yocto-poky-dea71b05021c54a4caa227cfcb3d4c024effdf15.zip ast2050-yocto-poky-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/recipes-devtools/btrfs-tools')
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb | 3 |
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 0000000..9ca9fca --- /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 312dff3..a5c556d 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" |
