diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2014-07-02 19:57:44 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:19:48 +0100 |
| commit | 0c7b4a5e23836889196f85f472f081d51529e94e (patch) | |
| tree | f300a95188e10f51ddd30f53ee2eff73e92d41ff /meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | |
| parent | 04bb223110da2f92725c341bc3ec0cf26325f675 (diff) | |
| download | openembedded-core-contrib-0c7b4a5e23836889196f85f472f081d51529e94e.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.
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-pkgconfigdeps.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch index f192545abb..5d182ad9fe 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch @@ -9,10 +9,11 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh ---- rpm-5.4.9.orig/scripts/pkgconfigdeps.sh 2009-02-13 08:13:37.000000000 -0600 -+++ rpm-5.4.9/scripts/pkgconfigdeps.sh 2012-06-07 17:35:42.730003847 -0500 -@@ -18,8 +18,8 @@ +Index: rpm-5.4.14/scripts/pkgconfigdeps.sh +=================================================================== +--- rpm-5.4.14.orig/scripts/pkgconfigdeps.sh ++++ rpm-5.4.14/scripts/pkgconfigdeps.sh +@@ -18,8 +18,8 @@ case $1 in *.pc) # Query the dependencies of the package. DIR=`dirname ${filename}` @@ -23,7 +24,7 @@ diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do [ -n "$n" ] || continue # We have a dependency. Make a note that we need the pkgconfig -@@ -42,8 +42,8 @@ +@@ -42,8 +42,8 @@ case $1 in [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" # Query the dependencies of the package. DIR=`dirname ${filename}` |