diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-06-11 13:18:55 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-12 11:05:53 +0100 |
| commit | a8ff3141fd78442bf328c9d3a489db88ad27486b (patch) | |
| tree | 4910919db5894a0daa00ba2b7da0ae836b127e5d /meta/recipes-devtools/rpm | |
| parent | 8a2b55c5b7c544ec15113bc21e5c62276449c9c3 (diff) | |
| download | openembedded-core-a8ff3141fd78442bf328c9d3a489db88ad27486b.tar.gz openembedded-core-a8ff3141fd78442bf328c9d3a489db88ad27486b.tar.bz2 openembedded-core-a8ff3141fd78442bf328c9d3a489db88ad27486b.zip | |
package_rpm: Add capability to directly query packageorigin
Add functionality to RPM to directly query the packageorigin (path) from
the resolver database, instead of having to do this via an indirect method.
This results in a minor performance improvement.
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')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch new file mode 100644 index 0000000000..3c6dad4d50 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch @@ -0,0 +1,23 @@ +Add the ability to query the packageorigin + +Written by jbj at rpm5.org + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm-5.4.8/rpmdb/hdrfmt.c +=================================================================== +--- rpm-5.4.8.orig/rpmdb/hdrfmt.c ++++ rpm-5.4.8/rpmdb/hdrfmt.c +@@ -2403,8 +2403,10 @@ static int pkgoriginTag(Header h, HE_t + int rc = 1; + + he->tag = RPMTAG_PACKAGEORIGIN; +- if (!headerGet(h, he, HEADERGET_NOEXTENSION) +- && (origin = headerGetOrigin(h)) != NULL) ++ /* XXX two sources for tag data: what search precedence? */ ++ if (headerGet(h, he, HEADERGET_NOEXTENSION)) ++ rc = 0; ++ else if ((origin = headerGetOrigin(h)) != NULL) + { + he->t = RPM_STRING_TYPE; + he->p.str = xstrdup(origin); diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 2ca0f58ff0..a38a684ff4 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file" -PR = "r41" +PR = "r42" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -70,6 +70,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex file://rpm-macros.patch \ file://rpm-lua.patch \ file://rpm-ossp-uuid.patch \ + file://rpm-packageorigin.patch \ " SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" |