gstreamer1.0: fix install race

The install hook needs to be a data hook not an exec hook (because automake),
the explicit dependency upstream added to fix the ordering results in
install-helpersPROGRAMS executing twice and potentially racing.

(From OE-Core rev: 0fde7c96bd81f16a70ad7193a91c3c2021c4aca4)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2015-11-12 19:47:46 +00:00
committed by Richard Purdie
parent 0ae52c8b2c
commit ee923bf11f
2 changed files with 25 additions and 0 deletions

View File

@@ -0,0 +1,24 @@
This needs to be a install-data-hook not an install-exec-hook as the helpers are
installed into helperdir which is considered data (only path variables with
"exec" in are considered executables).
The explicit dependency on install-helpersPROGRAMS was an attempt at solving
this, but this causes occasional races where install-helpersPROGRAMS can run
twice in parallel (once via install-all, once via the hook's dependency).
Upstream-Status: Backport [09aa20746a0fef97fb811c5503928c13a1f55eb5]
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
index 0ae9ab0..2530a34 100644
--- a/libs/gst/helpers/Makefile.am
+++ b/libs/gst/helpers/Makefile.am
@@ -23,7 +23,7 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS)
endif
-install-exec-hook: install-helpersPROGRAMS
+install-data-hook:
if HAVE_PTP
if HAVE_PTP_HELPER_SETUID
- chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper

View File

@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
SRC_URI = " \
http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
file://0001-Fix-crash-with-gst-inspect.patch \
file://fix-install-hook.patch \
"
SRC_URI[md5sum] = "e72e2dc2ee06bfc045bb6010c89de520"
SRC_URI[sha256sum] = "973a3f213c8d41d6dd0e4e7e38fd6cccacd5ae1ac09e1179a8d5d869ef0a5c9c"