summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.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-log-auto-rm.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-log-auto-rm.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
index 4f484c426d..3153f7a386 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
@@ -1,11 +1,11 @@
1 1
2Upstream-Status: Inappropriate [configuration] 2Upstream-Status: Inappropriate [configuration]
3 3
4diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in 4Index: rpm-5.4.14/rpmdb/DB_CONFIG.in
5index 8b94c94..e0b4689 100644 5===================================================================
6--- a/rpmdb/DB_CONFIG.in 6--- rpm-5.4.14.orig/rpmdb/DB_CONFIG.in
7+++ b/rpmdb/DB_CONFIG.in 7+++ rpm-5.4.14/rpmdb/DB_CONFIG.in
8@@ -4,6 +4,7 @@ 8@@ -4,6 +4,7 @@ set_data_dir .
9 set_create_dir . 9 set_create_dir .
10 set_lg_dir ./log 10 set_lg_dir ./log
11 set_tmp_dir ./tmp 11 set_tmp_dir ./tmp