summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch48
1 files changed, 0 insertions, 48 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
deleted file mode 100644
index 9e38f662e3..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1The hooks need to be split into install-data-hook and install-exec-hook as the
2hook fiddles with binaries that are installed by install-data and install-exec,
3otherwise there'll be occasional install failures due to the build racing.
4
5Upstream-Status: Backport (0c6be6604aafa84b525088d1ef4a4486d907743c)
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
9index 0ae9ab0..0067779 100644
10--- a/libs/gst/helpers/Makefile.am
11+++ b/libs/gst/helpers/Makefile.am
12@@ -23,17 +23,8 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
13 gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS)
14 endif
15
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
35+install-data-hook:
36+if HAVE_PTP
37+if HAVE_PTP_HELPER_SETUID
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