diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
| commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
| tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch | |
| parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
| parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
| download | blackbird-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.gz blackbird-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.zip | |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch')
| -rw-r--r-- | yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch new file mode 100644 index 000000000..3c9f1ea43 --- /dev/null +++ b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -0,0 +1,23 @@ +fix shared-mime-info build race condition + +The definition of install-data-hook in Makefile.am leads +to multiple, overlapping, executions of install-binPROGRAMS +target. We modify the definition to avoid that. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <jslater@windriver.com> + +--- a/Makefile.am ++++ b/Makefile.am +@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status + @INTLTOOL_XML_RULE@ + @INTLTOOL_DESKTOP_RULE@ + +-install-data-hook: install-binPROGRAMS ++# do NOT make this dependent on anything! ++# ++install-data-hook: + if ENABLE_UPDATE_MIMEDB + $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" + endif |
