diff options
| author | Jeff Johnson <n3npq@mac.com> | 2010-08-20 23:09:44 -0400 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-23 20:52:45 +0100 |
| commit | f0f911a10db9647c9f94299b68703ffcb62cd53f (patch) | |
| tree | b3aeb19b7dfea1bafdbee529e0ba4abebf747ec7 | |
| parent | 0741c3b8cbf259210a6d51e62e8e7e442309fda5 (diff) | |
| download | openembedded-core-f0f911a10db9647c9f94299b68703ffcb62cd53f.tar.gz openembedded-core-f0f911a10db9647c9f94299b68703ffcb62cd53f.tar.bz2 openembedded-core-f0f911a10db9647c9f94299b68703ffcb62cd53f.zip | |
rpm: use rpm-5.1.10 from SNAPSHOT URI.
rpm-5.1.10 snapshot adds support for multiple aid databases
revert slashDepth patch, now included in 5.1.10
Signed-off-by: Jeff Johnson <n3npq@mac.com>
Signed-off-by: Mark Hatle <mhatle@windriver.com>
| -rw-r--r-- | meta/packages/rpm/rpm/no_parentdir_ordering.patch | 11 | ||||
| -rw-r--r-- | meta/packages/rpm/rpm_5.1.10.bb (renamed from meta/packages/rpm/rpm_5.1.9.bb) | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/meta/packages/rpm/rpm/no_parentdir_ordering.patch b/meta/packages/rpm/rpm/no_parentdir_ordering.patch deleted file mode 100644 index 2ceb020a4e..0000000000 --- a/meta/packages/rpm/rpm/no_parentdir_ordering.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm-5.1.9/lib/depends.c.orig 2009-04-12 12:46:17.000000000 -0700 -+++ rpm-5.1.9/lib/depends.c 2010-08-14 11:28:11.000000000 -0700 -@@ -2257,7 +2257,7 @@ - #define isAuto(_x) ((_x) & _autobits) - - /*@unchecked@*/ --static int slashDepth = 100; /* #slashes pemitted in parentdir deps. */ -+static int slashDepth = 0; /* #slashes pemitted in parentdir deps. */ - - static int countSlashes(const char * dn) - /*@*/ diff --git a/meta/packages/rpm/rpm_5.1.9.bb b/meta/packages/rpm/rpm_5.1.10.bb index bf8ceb6d90..0a212ab47d 100644 --- a/meta/packages/rpm/rpm_5.1.9.bb +++ b/meta/packages/rpm/rpm_5.1.10.bb @@ -5,10 +5,9 @@ LICENSE = "LGPL 2.1" DEPENDS = "zlib perl popt beecrypt python libpcre elfutils" PR = "r2" -SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/${BPN}-${PV}.tar.gz \ +SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/SNAPSHOT/${BPN}-${PV}.tar.gz \ file://remove-compiled-tests.patch;apply=no \ file://perfile_rpmdeps.sh \ - file://no_parentdir_ordering.patch \ " inherit autotools gettext |