From ee923bf11fad93d7327bb401668f6413efdb3f3c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 12 Nov 2015 19:47:46 +0000 Subject: 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 Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0/fix-install-hook.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0') 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 @@ +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 + +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 -- cgit v1.2.3-54-g00ecf