summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-12 19:47:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:08:08 +0000
commitee923bf11fad93d7327bb401668f6413efdb3f3c (patch)
tree3d349cc5412f9b03b920dbd4620c0b65c09c1352
parent0ae52c8b2c1d7d7cdbcfeeae6ff42e64f16bc41d (diff)
downloadpoky-ee923bf11fad93d7327bb401668f6413efdb3f3c.tar.gz
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>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch24
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb1
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch
new file mode 100644
index 0000000000..71bd9bc319
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch
@@ -0,0 +1,24 @@
1This needs to be a install-data-hook not an install-exec-hook as the helpers are
2installed into helperdir which is considered data (only path variables with
3"exec" in are considered executables).
4
5The explicit dependency on install-helpersPROGRAMS was an attempt at solving
6this, but this causes occasional races where install-helpersPROGRAMS can run
7twice in parallel (once via install-all, once via the hook's dependency).
8
9Upstream-Status: Backport [09aa20746a0fef97fb811c5503928c13a1f55eb5]
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11
12diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
13index 0ae9ab0..2530a34 100644
14--- a/libs/gst/helpers/Makefile.am
15+++ b/libs/gst/helpers/Makefile.am
16@@ -23,7 +23,7 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
17 gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS)
18 endif
19
20-install-exec-hook: install-helpersPROGRAMS
21+install-data-hook:
22 if HAVE_PTP
23 if HAVE_PTP_HELPER_SETUID
24 - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb
index 2359249600..9618eaf2a8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
6SRC_URI = " \ 6SRC_URI = " \
7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ 7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
8 file://0001-Fix-crash-with-gst-inspect.patch \ 8 file://0001-Fix-crash-with-gst-inspect.patch \
9 file://fix-install-hook.patch \
9" 10"
10SRC_URI[md5sum] = "e72e2dc2ee06bfc045bb6010c89de520" 11SRC_URI[md5sum] = "e72e2dc2ee06bfc045bb6010c89de520"
11SRC_URI[sha256sum] = "973a3f213c8d41d6dd0e4e7e38fd6cccacd5ae1ac09e1179a8d5d869ef0a5c9c" 12SRC_URI[sha256sum] = "973a3f213c8d41d6dd0e4e7e38fd6cccacd5ae1ac09e1179a8d5d869ef0a5c9c"