diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:27 +0000 |
| commit | 007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch) | |
| tree | 32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch | |
| parent | a27ca6da59e6939a5bbab641236f7f792c03694f (diff) | |
| download | poky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz | |
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any
diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
(From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch index 07a0cfa300..a08412aa91 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch | |||
| @@ -12,16 +12,20 @@ it's easy enough to do by enabling the necessary macros. | |||
| 12 | 12 | ||
| 13 | Signed-off-by: yzhu1 <yanjun.zhu@windriver.com> | 13 | Signed-off-by: yzhu1 <yanjun.zhu@windriver.com> |
| 14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 15 | --- a/macros/macros.in | 15 | Index: rpm/macros/macros.in |
| 16 | +++ b/macros/macros.in | 16 | =================================================================== |
| 17 | @@ -546,8 +546,8 @@ $_arbitrary_tags_tests Foo:Bar | 17 | --- rpm.orig/macros/macros.in |
| 18 | +++ rpm/macros/macros.in | ||
| 19 | @@ -563,10 +563,10 @@ $_arbitrary_tags_tests Foo:Bar | ||
| 20 | |||
| 18 | # Horowitz Key Protocol server configuration | 21 | # Horowitz Key Protocol server configuration |
| 19 | # | 22 | # |
| 23 | -%_hkp_keyserver hkp://keys.rpm5.org | ||
| 24 | +#%_hkp_keyserver hkp://keys.rpm5.org | ||
| 20 | #%_hkp_keyserver hkp://keys.n3npq.net | 25 | #%_hkp_keyserver hkp://keys.n3npq.net |
| 21 | -%_hkp_keyserver hkp://pool.sks-keyservers.net | 26 | #%_hkp_keyserver hkp://pool.sks-keyservers.net |
| 22 | -%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search= | 27 | -%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search= |
| 23 | +#%_hkp_keyserver hkp://pool.sks-keyservers.net | ||
| 24 | +#%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search= | 28 | +#%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search= |
| 25 | 29 | ||
| 26 | 30 | ||
| 27 | %_nssdb_path /etc/pki/nssdb | 31 | # NSS_InitContext() parameter configuration |