diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-30 18:38:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-14 14:42:16 +0000 |
commit | bbddf83f65f490c88130d794c53ff9e4c45d0693 (patch) | |
tree | bec599b6bbb2c0022f922c97601cb621e4b3f3b9 /meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | |
parent | 27d56eeebd8197e359aae0a7ccac74cb55ff794d (diff) | |
download | poky-bbddf83f65f490c88130d794c53ff9e4c45d0693.tar.gz |
rpm: remove 5.x recipe
(From OE-Core rev: d0365f35303db3595688a6e5290677e02a72c54e)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch deleted file mode 100644 index 57fc6ce88c..0000000000 --- a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Add the ability to query the packageorigin | ||
2 | |||
3 | Written by jbj at rpm5.org | ||
4 | |||
5 | Upstream-Status: Submitted [RPM5 maintainer] | ||
6 | |||
7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
8 | |||
9 | Index: rpm-5.4.14/rpmdb/hdrfmt.c | ||
10 | =================================================================== | ||
11 | --- rpm-5.4.14.orig/rpmdb/hdrfmt.c | ||
12 | +++ rpm-5.4.14/rpmdb/hdrfmt.c | ||
13 | @@ -2409,8 +2409,10 @@ static int pkgoriginTag(Header h, HE_t h | ||
14 | int rc = 1; | ||
15 | |||
16 | he->tag = RPMTAG_PACKAGEORIGIN; | ||
17 | - if (!headerGet(h, he, HEADERGET_NOEXTENSION) | ||
18 | - && (origin = headerGetOrigin(h)) != NULL) | ||
19 | + /* XXX two sources for tag data: what search precedence? */ | ||
20 | + if (headerGet(h, he, HEADERGET_NOEXTENSION)) | ||
21 | + rc = 0; | ||
22 | + else if ((origin = headerGetOrigin(h)) != NULL) | ||
23 | { | ||
24 | he->t = RPM_STRING_TYPE; | ||
25 | he->p.str = xstrdup(origin); | ||