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:20:12 +0100 |
| commit | fe483ca37c33ebfe4c3e391244c47969e1560aeb (patch) | |
| tree | 4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | |
| parent | 107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff) | |
| download | poky-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-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] | |||
| 9 | 9 | ||
| 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 11 | 11 | ||
| 12 | diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh | 12 | Index: rpm-5.4.14/scripts/pkgconfigdeps.sh |
| 13 | --- rpm-5.4.9.orig/scripts/pkgconfigdeps.sh 2009-02-13 08:13:37.000000000 -0600 | 13 | =================================================================== |
| 14 | +++ rpm-5.4.9/scripts/pkgconfigdeps.sh 2012-06-07 17:35:42.730003847 -0500 | 14 | --- rpm-5.4.14.orig/scripts/pkgconfigdeps.sh |
| 15 | @@ -18,8 +18,8 @@ | 15 | +++ rpm-5.4.14/scripts/pkgconfigdeps.sh |
| 16 | @@ -18,8 +18,8 @@ case $1 in | ||
| 16 | *.pc) | 17 | *.pc) |
| 17 | # Query the dependencies of the package. | 18 | # Query the dependencies of the package. |
| 18 | DIR=`dirname ${filename}` | 19 | DIR=`dirname ${filename}` |
| @@ -23,7 +24,7 @@ diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps | |||
| 23 | $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do | 24 | $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do |
| 24 | [ -n "$n" ] || continue | 25 | [ -n "$n" ] || continue |
| 25 | # We have a dependency. Make a note that we need the pkgconfig | 26 | # We have a dependency. Make a note that we need the pkgconfig |
| 26 | @@ -42,8 +42,8 @@ | 27 | @@ -42,8 +42,8 @@ case $1 in |
| 27 | [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" | 28 | [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" |
| 28 | # Query the dependencies of the package. | 29 | # Query the dependencies of the package. |
| 29 | DIR=`dirname ${filename}` | 30 | DIR=`dirname ${filename}` |