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-fix-logio-cp.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-fix-logio-cp.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch b/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch new file mode 100644 index 0000000000..fa1ff43d6c --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | Occasionally the cp -p fails with a non-zero return code. This will cause | ||
| 2 | the system abort the build. | ||
| 3 | |||
| 4 | Upstream-status: Pending | ||
| 5 | |||
| 6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
| 7 | |||
| 8 | Index: rpm/rpmdb/Makefile.am | ||
| 9 | =================================================================== | ||
| 10 | --- rpm.orig/rpmdb/Makefile.am | ||
| 11 | +++ rpm/rpmdb/Makefile.am | ||
| 12 | @@ -234,11 +234,14 @@ lcov-report: | ||
| 13 | #lcov-upload: lcov | ||
| 14 | # rsync -rvz -e ssh --delete lcov/* ??? | ||
| 15 | |||
| 16 | +$(builddir)/logio_recover_template: $(srcdir)/logio_recover_template | ||
| 17 | + @if test ".$(builddir)" != ".$(srcdir)"; then \ | ||
| 18 | + cp -fp $(srcdir)/logio_recover_template \ | ||
| 19 | + $(builddir)/logio_recover_template ; \ | ||
| 20 | + fi | ||
| 21 | + | ||
| 22 | logio_BUILT = logio_auto.c logio_autop.c logio_auto.h logio_template | ||
| 23 | -$(logio_BUILT): logio.awk logio.src logio_recover_template | ||
| 24 | - @test -e $(builddir)/logio_recover_template || \ | ||
| 25 | - cp -p $(srcdir)/logio_recover_template \ | ||
| 26 | - $(builddir)/logio_recover_template | ||
| 27 | +$(logio_BUILT): logio.awk logio.src $(builddir)/logio_recover_template | ||
| 28 | @rm -f $(logio_BUILT) | ||
| 29 | @$(AWK) -f $(srcdir)/logio.awk \ | ||
| 30 | -v header_file=logio_auto.h \ | ||