summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/rpm/rpm/no_parentdir_ordering.patch11
-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 @@
1--- rpm-5.1.9/lib/depends.c.orig 2009-04-12 12:46:17.000000000 -0700
2+++ rpm-5.1.9/lib/depends.c 2010-08-14 11:28:11.000000000 -0700
3@@ -2257,7 +2257,7 @@
4 #define isAuto(_x) ((_x) & _autobits)
5
6 /*@unchecked@*/
7-static int slashDepth = 100; /* #slashes pemitted in parentdir deps. */
8+static int slashDepth = 0; /* #slashes pemitted in parentdir deps. */
9
10 static int countSlashes(const char * dn)
11 /*@*/
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"
5DEPENDS = "zlib perl popt beecrypt python libpcre elfutils" 5DEPENDS = "zlib perl popt beecrypt python libpcre elfutils"
6PR = "r2" 6PR = "r2"
7 7
8SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/${BPN}-${PV}.tar.gz \ 8SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/SNAPSHOT/${BPN}-${PV}.tar.gz \
9 file://remove-compiled-tests.patch;apply=no \ 9 file://remove-compiled-tests.patch;apply=no \
10 file://perfile_rpmdeps.sh \ 10 file://perfile_rpmdeps.sh \
11 file://no_parentdir_ordering.patch \
12 " 11 "
13inherit autotools gettext 12inherit autotools gettext
14 13