diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-12-18 18:00:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-02 17:24:36 +0000 |
commit | 0ac5ca3fcf60d42337ea62c3006f3787a7978131 (patch) | |
tree | b5e5909c499ff39d74815b7603125df2a85cb5cf /meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch | |
parent | 0d5475a3b28d9e2c9273967a03726bb6c427bd11 (diff) | |
download | poky-0ac5ca3fcf60d42337ea62c3006f3787a7978131.tar.gz |
rpm: update to 4.14.0
Previously oe-core had a development snapshot of rpm, it's better to update
to something more stable.
Removed patches:
0001-Add-PYTHON_ABI-when-searching-for-python-libraries.patch
(upstream is using pkg-config)
0001-When-nice-value-cannot-be-reset-issue-a-notice-inste.patch
(functionality has been moved to a plugin, we disable plugins
for rpm-native)
0012-Use-conditional-to-access-_docdir-in-macros.in.patch
(merged upstream)
Changed patches:
0001-Fix-build-with-musl-C-library.patch
(one previous musl issue has been resolved upstream; another has been added)
Rest of the patches are trivial rebases.
Update the signing oe-selftest so that the reference output matches
the upstream changes.
(From OE-Core rev: b4613b6ce07c295c5d6de6861acf19315acaccb2)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch | 36 |
1 files changed, 0 insertions, 36 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 deleted file mode 100644 index 996da90d43..0000000000 --- a/meta/recipes-devtools/rpm/files/0012-Use-conditional-to-access-_docdir-in-macros.in.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
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 | |||