diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch b/import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch new file mode 100644 index 000000000..290ec1aa1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch @@ -0,0 +1,30 @@ +Occasionally the cp -p fails with a non-zero return code. This will cause +the system abort the build. + +Upstream-Status: Submitted [RPM5 maintainer] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm/rpmdb/Makefile.am +=================================================================== +--- rpm.orig/rpmdb/Makefile.am ++++ rpm/rpmdb/Makefile.am +@@ -234,11 +234,14 @@ lcov-report: + #lcov-upload: lcov + # rsync -rvz -e ssh --delete lcov/* ??? + ++$(builddir)/logio_recover_template: $(srcdir)/logio_recover_template ++ @if test ".$(builddir)" != ".$(srcdir)"; then \ ++ cp -fp $(srcdir)/logio_recover_template \ ++ $(builddir)/logio_recover_template ; \ ++ fi ++ + logio_BUILT = logio_auto.c logio_autop.c logio_auto.h logio_template +-$(logio_BUILT): logio.awk logio.src logio_recover_template +- @test -e $(builddir)/logio_recover_template || \ +- cp -p $(srcdir)/logio_recover_template \ +- $(builddir)/logio_recover_template ++$(logio_BUILT): logio.awk logio.src $(builddir)/logio_recover_template + @rm -f $(logio_BUILT) + @$(AWK) -f $(srcdir)/logio.awk \ + -v header_file=logio_auto.h \ |