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/lib/oeqa/selftest | |
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/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/signing.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index b3d1a8292e..a750cfc7b2 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py | |||
@@ -87,7 +87,7 @@ class Signing(OESelftestTestCase): | |||
87 | ret = runCmd('%s/rpmkeys --define "_dbpath %s" --checksig %s' % | 87 | ret = runCmd('%s/rpmkeys --define "_dbpath %s" --checksig %s' % |
88 | (staging_bindir_native, rpmdb, pkg_deploy)) | 88 | (staging_bindir_native, rpmdb, pkg_deploy)) |
89 | # tmp/deploy/rpm/i586/ed-1.9-r0.i586.rpm: rsa sha1 md5 OK | 89 | # tmp/deploy/rpm/i586/ed-1.9-r0.i586.rpm: rsa sha1 md5 OK |
90 | self.assertIn('rsa sha1 (md5) pgp md5 OK', ret.output, 'Package signed incorrectly.') | 90 | self.assertIn('digests signatures OK', ret.output, 'Package signed incorrectly.') |
91 | shutil.rmtree(rpmdb) | 91 | shutil.rmtree(rpmdb) |
92 | 92 | ||
93 | #Check that an image can be built from signed packages | 93 | #Check that an image can be built from signed packages |