diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2014-05-12 10:35:34 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-13 19:24:03 +0100 |
| commit | 117862cd0eebf6887c2ea6cc353432caee2653aa (patch) | |
| tree | 76f6d4ff3f1dae4ab12b109f92c8dd47688afede /meta/recipes-devtools | |
| parent | 01f3afece8917a5f965f463b79e04693b0d2932a (diff) | |
| download | openembedded-core-117862cd0eebf6887c2ea6cc353432caee2653aa.tar.gz openembedded-core-117862cd0eebf6887c2ea6cc353432caee2653aa.tar.bz2 openembedded-core-117862cd0eebf6887c2ea6cc353432caee2653aa.zip | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 1 |
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 @@ +lib/verify.c: Fix rpm -V file processing + +rpm -V should verify the md5sum and other values on individual files. +A logic error in the query for GHOST files prevented this from working. + +[ Upstream-Status: Submitted ] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm-5.4.9/lib/verify.c +=================================================================== +--- rpm-5.4.9.orig/lib/verify.c ++++ rpm-5.4.9/lib/verify.c +@@ -587,7 +587,7 @@ uint32_t fc = rpmfiFC(fi); + + /* If not verifying %ghost, skip ghost files. */ + /* XXX the broken!!! logic disables %ghost queries always. */ +- if (!(FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST))) ++ if (!(FF_ISSET(qva->qva_fflags, GHOST)) && FF_ISSET(fflags, GHOST)) + continue; + + /* 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 file://rpm-platform-file-fix.patch \ file://rpm-lsb-compatibility.patch \ file://rpm-tag-generate-endian-conversion-fix.patch \ + file://rpm-verify-files.patch \ " # Uncomment the following line to enable platform score debugging |