diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-07-07 14:59:02 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-24 00:46:57 +0100 |
| commit | 8760cde94aca80a920cb50230d61c187d3cfeee4 (patch) | |
| tree | 208300c2be553d55b36ebc6e5f644d3b19cb429a /meta/packages/rpm/files/missingok.patch | |
| parent | 60fa21d157823b9c6ffd4a066d3afdd2f0224d17 (diff) | |
| download | poky-8760cde94aca80a920cb50230d61c187d3cfeee4.tar.gz | |
rpm: switch to using RPM 5
Switch to RPM5 as our rpm provider of choice and update the recipe to the latest
stable release.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Modify the package_rpm.bbclass to understand the macro and command line changes
present in rpm5.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/packages/rpm/files/missingok.patch')
| -rw-r--r-- | meta/packages/rpm/files/missingok.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/packages/rpm/files/missingok.patch b/meta/packages/rpm/files/missingok.patch deleted file mode 100644 index b008c9a02b..0000000000 --- a/meta/packages/rpm/files/missingok.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | Obey MISSINGOK flag for dependencies. Backport from rpm-4.4.7. | ||
| 2 | |||
| 3 | Index: lib/depends.c | ||
| 4 | =================================================================== | ||
| 5 | --- lib/depends.c.orig 2008-04-01 08:28:22.000000000 +0100 | ||
| 6 | +++ lib/depends.c 2008-09-04 14:09:58.000000000 +0100 | ||
| 7 | @@ -593,8 +593,13 @@ | ||
| 8 | /*@=boundsread@*/ | ||
| 9 | |||
| 10 | unsatisfied: | ||
| 11 | - rc = 1; /* dependency is unsatisfied */ | ||
| 12 | - rpmdsNotify(dep, NULL, rc); | ||
| 13 | + if (rpmdsFlags(dep) & RPMSENSE_MISSINGOK) { | ||
| 14 | + rc = 0; /* dependency is unsatisfied, but just a hint. */ | ||
| 15 | + rpmdsNotify(dep, _("(hint skipped)"), rc); | ||
| 16 | + } else { | ||
| 17 | + rc = 1; /* dependency is unsatisfied */ | ||
| 18 | + rpmdsNotify(dep, NULL, rc); | ||
| 19 | + } | ||
| 20 | |||
| 21 | exit: | ||
| 22 | /* | ||
| 23 | @@ -963,6 +968,8 @@ | ||
| 24 | return "Requires(postun):"; | ||
| 25 | if (f & RPMSENSE_SCRIPT_VERIFY) | ||
| 26 | return "Requires(verify):"; | ||
| 27 | + if (f & RPMSENSE_MISSINGOK) | ||
| 28 | + return "Requires(hint):"; | ||
| 29 | if (f & RPMSENSE_FIND_REQUIRES) | ||
| 30 | return "Requires(auto):"; | ||
| 31 | return "Requires:"; | ||
| 32 | Index: lib/rpmlib.h | ||
| 33 | =================================================================== | ||
| 34 | --- lib/rpmlib.h.orig 2008-09-03 22:22:43.000000000 +0100 | ||
| 35 | +++ lib/rpmlib.h 2008-09-04 15:17:17.000000000 +0100 | ||
| 36 | @@ -562,6 +562,8 @@ | ||
| 37 | RPMSENSE_SCRIPT_POSTUN | \ | ||
| 38 | RPMSENSE_SCRIPT_VERIFY | \ | ||
| 39 | RPMSENSE_FIND_REQUIRES | \ | ||
| 40 | + RPMSENSE_MISSINGOK | \ | ||
| 41 | + RPMSENSE_STRONG | \ | ||
| 42 | RPMSENSE_SCRIPT_PREP | \ | ||
| 43 | RPMSENSE_SCRIPT_BUILD | \ | ||
| 44 | RPMSENSE_SCRIPT_INSTALL | \ | ||
