diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch new file mode 100644 index 0000000000..8c01a30651 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | lib/rpmts.c: Ensure that we check both providename and filepaths | ||
2 | |||
3 | When looking up a missing dependencies, such as /bin/sh, we need to lookup | ||
4 | in both the providename and filepaths DB, not just the filepaths DB. | ||
5 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
7 | |||
8 | --- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600 | ||
9 | +++ rpm-5.4.0/lib/rpmts.c 2012-04-12 15:01:12.990184067 -0500 | ||
10 | @@ -403,8 +403,8 @@ | ||
11 | if (sdb == NULL) | ||
12 | continue; | ||
13 | |||
14 | - /* Look for a matching Provides: in suggested universe. */ | ||
15 | - rpmtag = (*keyp == '/' ? RPMTAG_FILEPATHS : RPMTAG_PROVIDENAME); | ||
16 | + rpmtag = RPMTAG_PROVIDENAME; | ||
17 | + do { | ||
18 | mi = rpmmiInit(sdb, rpmtag, keyp, keylen); | ||
19 | while ((h = rpmmiNext(mi)) != NULL) { | ||
20 | size_t hnamelen; | ||
21 | @@ -439,6 +439,15 @@ | ||
22 | bhnamelen = hnamelen; | ||
23 | } | ||
24 | mi = rpmmiFree(mi); | ||
25 | + | ||
26 | + if (bh == NULL && *keyp == '/' && rpmtag == RPMTAG_PROVIDENAME) { | ||
27 | + rpmtag = RPMTAG_FILEPATHS; | ||
28 | + continue; | ||
29 | + } | ||
30 | + | ||
31 | + break; | ||
32 | + } while (1); | ||
33 | + | ||
34 | } | ||
35 | |||
36 | /* Is there a suggested resolution? */ | ||