summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-05-12 10:35:34 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:24 +0100
commit44fddc9ba1f67babb2c7bfc8794fb593965a0961 (patch)
tree37b5218ec7c4943ba7a4aaa769006b8bba080e67
parent8bbd5958b012c019617cd7c20554e1e7168687a2 (diff)
downloadpoky-44fddc9ba1f67babb2c7bfc8794fb593965a0961.tar.gz
rpm: Fix rpm -V usage
[YOCTO #6309] It appears a logic issue has caused rpm -V to no longer verify the files on the filesystem match what was installed. (From OE-Core rev: 117862cd0eebf6887c2ea6cc353432caee2653aa) (From OE-Core rev: 0fe6974b3a4bd4d4fc1d8d4398650c1313840f01) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch22
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch b/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
new file mode 100644
index 0000000000..fddac7a1c0
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
@@ -0,0 +1,22 @@
1lib/verify.c: Fix rpm -V file processing
2
3rpm -V should verify the md5sum and other values on individual files.
4A logic error in the query for GHOST files prevented this from working.
5
6[ Upstream-Status: Submitted ]
7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9
10Index: rpm-5.4.9/lib/verify.c
11===================================================================
12--- rpm-5.4.9.orig/lib/verify.c
13+++ rpm-5.4.9/lib/verify.c
14@@ -587,7 +587,7 @@ uint32_t fc = rpmfiFC(fi);
15
16 /* If not verifying %ghost, skip ghost files. */
17 /* XXX the broken!!! logic disables %ghost queries always. */
18- if (!(FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST)))
19+ if (!(FF_ISSET(qva->qva_fflags, GHOST)) && FF_ISSET(fflags, GHOST))
20 continue;
21
22 /* Gather per-file data into a carrier. */
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index dbdab1a5e3..43f46ed024 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -90,6 +90,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
90 file://rpm-platform-file-fix.patch \ 90 file://rpm-platform-file-fix.patch \
91 file://rpm-lsb-compatibility.patch \ 91 file://rpm-lsb-compatibility.patch \
92 file://rpm-tag-generate-endian-conversion-fix.patch \ 92 file://rpm-tag-generate-endian-conversion-fix.patch \
93 file://rpm-verify-files.patch \
93 " 94 "
94 95
95# Uncomment the following line to enable platform score debugging 96# Uncomment the following line to enable platform score debugging