diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-10-03 00:27:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 14:21:41 +0100 |
commit | 077532d20d4b14f4ccd354cb80d5f8bd5a749ab6 (patch) | |
tree | b39f8a6931be5c833969a7d83b46359627c132c5 /meta/recipes-extended/man-db/files | |
parent | 9f28e2d38062e4347a4e2134dee3a12e291c469f (diff) | |
download | poky-077532d20d4b14f4ccd354cb80d5f8bd5a749ab6.tar.gz |
man-db: fix multilib install file conflict
The first line of config file man_db.conf is the package name. It causes
multilib install file conflict. So add a patch to remove the line.
(From OE-Core rev: d138b1ec4aef88a3b0c4f1d698ed2a224c93b889)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/man-db/files')
-rw-r--r-- | meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch b/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch new file mode 100644 index 0000000000..03273d3b49 --- /dev/null +++ b/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | The first line of man_db.conf will be replaced by package name. And it causes | ||
2 | multilib install file conflict. Remove the line to avoid the issue. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
7 | |||
8 | diff --git a/src/man_db.conf.in b/src/man_db.conf.in | ||
9 | index bc8bb7e..04cfb31 100644 | ||
10 | --- a/src/man_db.conf.in | ||
11 | +++ b/src/man_db.conf.in | ||
12 | @@ -1,4 +1,3 @@ | ||
13 | -# @config_file_basename@ | ||
14 | # | ||
15 | # This file is used by the man-db package to configure the man and cat paths. | ||
16 | # It is also used to provide a manpath for those without one by examining | ||