diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-11-19 12:12:37 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2009-03-19 20:22:34 +0100 |
| commit | aed057419cb98babd0c3856a76222c72c7919a81 (patch) | |
| tree | 111aef7acd635c1a1addf9548466c92e45d6ca1d /recipes/rpm/files/missingok.patch | |
| parent | 47bb0f5ca3d62205703973398d79ed553bed8a4f (diff) | |
rpm/rpm-native: Add recipe for 4.4.2.3 (from Poky)
Squashed set of changes from Poky:
svn r5069 - rpm/rpm-native: Add recipe for 4.4.2.3
svn r5085 - rpm: Patch out some Makefile strangeness causing build failures
svn r5093 - rpm: Enable python extensions and improve cross compiling patches
svn r5103 - rpm: Tweak patches to remove popt problem
svn r5113 - rpm: Add recommends support from suse rpm patches
svn r5132 - rpm-native: Set varprefix to get the rpm database in a sane location
svn r5152 - rpm: Handle PYTHONVER differently in EXTRA_OECONF to stop gettext/uclibc failures during parsing
svn r5154 - rpm: Add missing patches
svn r5423 - rpm: Add python module packaging
OE changes:
rpm-native: add Python 2.6 support
rpm: use distutils-base to get Python version
rpm: use sed instead of ed - it is present in our metadata
rpm: set ARM_INSTRUCTION_SET as it fails to build for thumb
| /tmp/ccYO91se.s: Assembler messages:
| /tmp/ccYO91se.s:71: Error: selected processor does not support `swpb r2,r3,[r4]'
| /tmp/ccYO91se.s:72: Error: unshifted register required -- `eor r2,r2,#1'
Diffstat (limited to 'recipes/rpm/files/missingok.patch')
| -rw-r--r-- | recipes/rpm/files/missingok.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/recipes/rpm/files/missingok.patch b/recipes/rpm/files/missingok.patch new file mode 100644 index 0000000000..b008c9a02b --- /dev/null +++ b/recipes/rpm/files/missingok.patch @@ -0,0 +1,44 @@ +Obey MISSINGOK flag for dependencies. Backport from rpm-4.4.7. + +Index: lib/depends.c +=================================================================== +--- lib/depends.c.orig 2008-04-01 08:28:22.000000000 +0100 ++++ lib/depends.c 2008-09-04 14:09:58.000000000 +0100 +@@ -593,8 +593,13 @@ + /*@=boundsread@*/ + + unsatisfied: +- rc = 1; /* dependency is unsatisfied */ +- rpmdsNotify(dep, NULL, rc); ++ if (rpmdsFlags(dep) & RPMSENSE_MISSINGOK) { ++ rc = 0; /* dependency is unsatisfied, but just a hint. */ ++ rpmdsNotify(dep, _("(hint skipped)"), rc); ++ } else { ++ rc = 1; /* dependency is unsatisfied */ ++ rpmdsNotify(dep, NULL, rc); ++ } + + exit: + /* +@@ -963,6 +968,8 @@ + return "Requires(postun):"; + if (f & RPMSENSE_SCRIPT_VERIFY) + return "Requires(verify):"; ++ if (f & RPMSENSE_MISSINGOK) ++ return "Requires(hint):"; + if (f & RPMSENSE_FIND_REQUIRES) + return "Requires(auto):"; + return "Requires:"; +Index: lib/rpmlib.h +=================================================================== +--- lib/rpmlib.h.orig 2008-09-03 22:22:43.000000000 +0100 ++++ lib/rpmlib.h 2008-09-04 15:17:17.000000000 +0100 +@@ -562,6 +562,8 @@ + RPMSENSE_SCRIPT_POSTUN | \ + RPMSENSE_SCRIPT_VERIFY | \ + RPMSENSE_FIND_REQUIRES | \ ++ RPMSENSE_MISSINGOK | \ ++ RPMSENSE_STRONG | \ + RPMSENSE_SCRIPT_PREP | \ + RPMSENSE_SCRIPT_BUILD | \ + RPMSENSE_SCRIPT_INSTALL | \ |