summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 23:42:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-07 10:57:50 +0100
commitb5f288ab23925e830df5473855b1868e15ff9487 (patch)
tree2242391a9617b7072e887fd24fdcf503451c7dc9
parent48f06c0a92c2d86f3983025783f1b267b4d1c355 (diff)
downloadpoky-b5f288ab23925e830df5473855b1868e15ff9487.tar.gz
chrpath: Ensure the package respects the docdir variable
This resolves unpackaged file QA warnings and an empty -doc package. (From OE-Core rev: 1b44053f6c4ac33d5058183e6634b1ba831ae601) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/chrpath/chrpath/standarddoc.patch19
-rw-r--r--meta/recipes-devtools/chrpath/chrpath_0.13.bb5
2 files changed, 22 insertions, 2 deletions
diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
new file mode 100644
index 0000000000..f96f104fad
--- /dev/null
+++ b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
@@ -0,0 +1,19 @@
1Upstream-Status: Pending
2
3autoconf/automake set docdir automatically, use their value ensuring
4doc files are placed into $datadir/doc, not $prefix/doc.
5
6RP 5/7/2011
7
8Index: chrpath-0.13/Makefile.am
9===================================================================
10--- chrpath-0.13.orig/Makefile.am 2011-07-05 23:40:14.769920254 +0100
11+++ chrpath-0.13/Makefile.am 2011-07-05 23:40:19.819920635 +0100
12@@ -1,7 +1,5 @@
13 SUBDIRS = testsuite deb
14
15-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
16-
17 doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
18
19 bin_PROGRAMS = chrpath
diff --git a/meta/recipes-devtools/chrpath/chrpath_0.13.bb b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
index 200f4446b7..d65725eb06 100644
--- a/meta/recipes-devtools/chrpath/chrpath_0.13.bb
+++ b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
@@ -4,9 +4,10 @@ looks for libraries) in an application. It does not (yet) allow you to add an \
4rpath if there isn't one already." 4rpath if there isn't one already."
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7PR = "r2" 7PR = "r3"
8 8
9SRC_URI = "${DEBIAN_MIRROR}/main/c/chrpath/chrpath_${PV}.orig.tar.gz" 9SRC_URI = "${DEBIAN_MIRROR}/main/c/chrpath/chrpath_${PV}.orig.tar.gz \
10 file://standarddoc.patch"
10 11
11SRC_URI[md5sum] = "b73072a8fbba277558c50364b65bb407" 12SRC_URI[md5sum] = "b73072a8fbba277558c50364b65bb407"
12SRC_URI[sha256sum] = "c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b" 13SRC_URI[sha256sum] = "c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b"