diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-12-04 14:42:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 10:20:50 +0000 |
| commit | b0bbea56bee00863e129f8a67b213a6a9bd25ce6 (patch) | |
| tree | 4c1fb16024599a56a08adc6bfeda7376c5bd369a | |
| parent | b82221674e1522041da2deb5bd2a7f73594539e3 (diff) | |
| download | poky-b0bbea56bee00863e129f8a67b213a6a9bd25ce6.tar.gz | |
gstreamer: really fix the helper install race
My previous fix wasn't enough and just made the race rarer.
(From OE-Core rev: cb033af4432be8d3793b1a79574fc731d7295e72)
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.patch | 50 |
1 files changed, 37 insertions, 13 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 index 71bd9bc319..9e38f662e3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch | |||
| @@ -1,24 +1,48 @@ | |||
| 1 | This needs to be a install-data-hook not an install-exec-hook as the helpers are | 1 | The hooks need to be split into install-data-hook and install-exec-hook as the |
| 2 | installed into helperdir which is considered data (only path variables with | 2 | hook fiddles with binaries that are installed by install-data and install-exec, |
| 3 | "exec" in are considered executables). | 3 | otherwise there'll be occasional install failures due to the build racing. |
| 4 | 4 | ||
| 5 | The explicit dependency on install-helpersPROGRAMS was an attempt at solving | 5 | Upstream-Status: Backport (0c6be6604aafa84b525088d1ef4a4486d907743c) |
| 6 | this, but this causes occasional races where install-helpersPROGRAMS can run | ||
| 7 | twice in parallel (once via install-all, once via the hook's dependency). | ||
| 8 | |||
| 9 | Upstream-Status: Backport [09aa20746a0fef97fb811c5503928c13a1f55eb5] | ||
| 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 6 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 11 | 7 | ||
| 12 | diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am | 8 | diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am |
| 13 | index 0ae9ab0..2530a34 100644 | 9 | index 0ae9ab0..0067779 100644 |
| 14 | --- a/libs/gst/helpers/Makefile.am | 10 | --- a/libs/gst/helpers/Makefile.am |
| 15 | +++ b/libs/gst/helpers/Makefile.am | 11 | +++ b/libs/gst/helpers/Makefile.am |
| 16 | @@ -23,7 +23,7 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS) | 12 | @@ -23,17 +23,8 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS) |
| 17 | gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS) | 13 | gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS) |
| 18 | endif | 14 | endif |
| 19 | 15 | ||
| 20 | -install-exec-hook: install-helpersPROGRAMS | 16 | -install-exec-hook: install-helpersPROGRAMS |
| 17 | -if HAVE_PTP | ||
| 18 | -if HAVE_PTP_HELPER_SETUID | ||
| 19 | - - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper | ||
| 20 | - - chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper | ||
| 21 | -endif | ||
| 22 | -if HAVE_PTP_HELPER_CAPABILITIES | ||
| 23 | - - $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper | ||
| 24 | -endif | ||
| 25 | -endif | ||
| 26 | if ENABLE_BASH_COMPLETION | ||
| 27 | +install-exec-hook: | ||
| 28 | $(MKDIR_P) $(DESTDIR)$(BASH_HELPERS_DIR) && \ | ||
| 29 | cd $(DESTDIR)$(bindir) && \ | ||
| 30 | $(INSTALL) `echo "gst-completion-helper-" | sed '$(transform)'`@GST_API_VERSION@$(EXEEXT) \ | ||
| 31 | @@ -44,6 +35,17 @@ uninstall-hook: | ||
| 32 | rm -f $(DESTDIR)$(BASH_HELPERS_DIR)/gst-completion-helper-@GST_API_VERSION@$(EXEEXT) | ||
| 33 | endif | ||
| 34 | |||
| 21 | +install-data-hook: | 35 | +install-data-hook: |
| 22 | if HAVE_PTP | 36 | +if HAVE_PTP |
| 23 | if HAVE_PTP_HELPER_SETUID | 37 | +if HAVE_PTP_HELPER_SETUID |
| 24 | - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper | 38 | + - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper |
| 39 | + - chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper | ||
| 40 | +endif | ||
| 41 | +if HAVE_PTP_HELPER_CAPABILITIES | ||
| 42 | + - $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper | ||
| 43 | +endif | ||
| 44 | +endif | ||
| 45 | + | ||
| 46 | # clean out the old one to make sure everything is udpated correctly | ||
| 47 | # remove again after release | ||
| 48 | CLEANFILES = plugin-scanner | ||