diff options
| author | Dengke Du <dengke.du@windriver.com> | 2017-07-12 22:19:18 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:39 +0100 |
| commit | 1d7fab4b0fcfffa27473d5b9ca288cc917d35301 (patch) | |
| tree | b34223c02a3e0b2dc6ec068754c1105a0944447b | |
| parent | ff576d1071a07573338593c34fd7f6d33cfb7607 (diff) | |
| download | poky-1d7fab4b0fcfffa27473d5b9ca288cc917d35301.tar.gz | |
chrpath: reduce local pending patches
(From OE-Core rev: 29e55fe5c5085e40dc9408294a9c59368b029f08)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/chrpath/chrpath/standarddoc.patch | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch index f96f104fad..3d303fbc6f 100644 --- a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch +++ b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch | |||
| @@ -1,14 +1,24 @@ | |||
| 1 | Upstream-Status: Pending | 1 | From 285b5fbf1d6b25ff55d305c17edf4d327bf19dd3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 3 | Date: Tue, 5 Jul 2011 23:42:29 +0100 | ||
| 4 | Subject: [PATCH] chrpath: Ensure the package respects the docdir variable | ||
| 2 | 5 | ||
| 3 | autoconf/automake set docdir automatically, use their value ensuring | 6 | autoconf/automake set docdir automatically, use their value ensuring |
| 4 | doc files are placed into $datadir/doc, not $prefix/doc. | 7 | doc files are placed into $datadir/doc, not $prefix/doc. |
| 5 | 8 | ||
| 6 | RP 5/7/2011 | 9 | RP 5/7/2011 |
| 7 | 10 | ||
| 8 | Index: chrpath-0.13/Makefile.am | 11 | Upstream-Status: Submitted [ http://lists.alioth.debian.org/pipermail/chrpath-devel/Week-of-Mon-20170710/000013.html ] |
| 9 | =================================================================== | 12 | |
| 10 | --- chrpath-0.13.orig/Makefile.am 2011-07-05 23:40:14.769920254 +0100 | 13 | Signed-off-by: Dengke Du <dengke.du@windriver.com> |
| 11 | +++ chrpath-0.13/Makefile.am 2011-07-05 23:40:19.819920635 +0100 | 14 | --- |
| 15 | Makefile.am | 2 -- | ||
| 16 | 1 file changed, 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/Makefile.am b/Makefile.am | ||
| 19 | index b50ad21..5f7e861 100644 | ||
| 20 | --- a/Makefile.am | ||
| 21 | +++ b/Makefile.am | ||
| 12 | @@ -1,7 +1,5 @@ | 22 | @@ -1,7 +1,5 @@ |
| 13 | SUBDIRS = testsuite deb | 23 | SUBDIRS = testsuite deb |
| 14 | 24 | ||
| @@ -17,3 +27,6 @@ Index: chrpath-0.13/Makefile.am | |||
| 17 | doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README | 27 | doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README |
| 18 | 28 | ||
| 19 | bin_PROGRAMS = chrpath | 29 | bin_PROGRAMS = chrpath |
| 30 | -- | ||
| 31 | 2.8.1 | ||
| 32 | |||
