summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-07-02 19:57:44 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commitfe483ca37c33ebfe4c3e391244c47969e1560aeb (patch)
tree4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
parent107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff)
downloadpoky-fe483ca37c33ebfe4c3e391244c47969e1560aeb.tar.gz
rpm: Upgrade to 5.4.14
Update various patches. A few corrections to the patch descriptions, otherwise simple quilt refresh or conflict resolution. Remove rpm-solvedb.patch and rpm-respect-arch.patch. These are both related to the old solvedb package dependency solver. This is no longer used since we moved to smartpm. rpm-stub-out-git_strerror was a backport and is no longer needed. RPM 5.4.12 and newer normally requires Berkley DB 6.0 or newer. A small patch to configure allows RPM to dynamically select DB 5.3 or DB 6.0 based on what is available at configure time. (From OE-Core rev: 0c7b4a5e23836889196f85f472f081d51529e94e) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
index 33ec8e21e1..0a5f5a4d72 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
@@ -8,10 +8,10 @@ Upstream-Status: Inapproriate (OpenEmbedded specific)
8 8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10 10
11Index: rpm-5.4.9/macros/macros.in 11Index: rpm-5.4.14/macros/macros.in
12=================================================================== 12===================================================================
13--- rpm-5.4.9.orig/macros/macros.in 13--- rpm-5.4.14.orig/macros/macros.in
14+++ rpm-5.4.9/macros/macros.in 14+++ rpm-5.4.14/macros/macros.in
15@@ -27,11 +27,12 @@ 15@@ -27,11 +27,12 @@
16 #============================================================================== 16 #==============================================================================
17 # ---- filesystem macros. 17 # ---- filesystem macros.