diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-06-09 21:34:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-12 23:01:23 +0100 |
commit | 246b73ad553dfe8d52da750e0341a99e13926294 (patch) | |
tree | f6b9c86625144126654ced30760655f995920baf /meta/recipes-devtools/rpm/files | |
parent | acca495fae8b8cb71e47382af12ea0f0b5baa408 (diff) | |
download | poky-246b73ad553dfe8d52da750e0341a99e13926294.tar.gz |
rpm: Use conditional to access %{_docdir} in macros.in
This avoids the following warning:
warning: Ignoring invalid regex %{_docdir}
when runing `rpmdeps -R <file>`, since %{_docdir} is only defined when
parsing a spec file.
(From OE-Core rev: 7e0964e506506d20a25aac570104938759f9f70e)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch b/meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch new file mode 100644 index 0000000000..996da90d43 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 77808db4036dc4a012c47aca36255549ed764a6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Tue, 16 May 2017 10:58:18 +0200 | ||
4 | Subject: [PATCH 12/13] Use conditional to access %{_docdir} in macros.in | ||
5 | |||
6 | This avoids the following warning: | ||
7 | |||
8 | warning: Ignoring invalid regex %{_docdir} | ||
9 | |||
10 | when runing `rpmdeps -R <file>`, since %{_docdir} is only defined when | ||
11 | parsing a spec file (in parseSpec()). | ||
12 | |||
13 | Upstream-Status: Accepted [https://github.com/rpm-software-management/rpm/pull/216] | ||
14 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
15 | --- | ||
16 | macros.in | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/macros.in b/macros.in | ||
20 | index 84ae25275..cca67a500 100644 | ||
21 | --- a/macros.in | ||
22 | +++ b/macros.in | ||
23 | @@ -200,8 +200,8 @@ package or when debugging this package.\ | ||
24 | # Their purpouse is to set up global filtering for all packages. If you need | ||
25 | # to set up specific filtering for your package use %__requires_exclude_from | ||
26 | # and %__provides_exclude_from instead. | ||
27 | -%__global_requires_exclude_from %{_docdir} | ||
28 | -%__global_provides_exclude_from %{_docdir} | ||
29 | +%__global_requires_exclude_from %{?_docdir:%{_docdir}} | ||
30 | +%__global_provides_exclude_from %{?_docdir:%{_docdir}} | ||
31 | |||
32 | # The path to the gzip executable (legacy, use %{__gzip} instead). | ||
33 | %_gzipbin %{__gzip} | ||
34 | -- | ||
35 | 2.12.0 | ||
36 | |||