Skip to contentSkip to conversation

gstreamer: Fix reproducibility issue around libcap

PATCH In review Richard Purdie 3 participants 5 messages Feb 19, 2020 – Feb 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gstreamer: Fix reproducibility issue around libcap

Add an option to avoid builds depending on the presence of setcap from the host system.

---
 .../gstreamer/gstreamer1.0/capfix.patch       | 37 +++++++++++++++++++
 .../gstreamer/gstreamer1.0_1.16.1.bb          |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file +37 -0
new file mode 100644
index 00000000000..7ca3d5ad4a6
@@ -0,0 +1,37 @@
+Currently gstreamer configuration depends on whether setcap is found on the host
+system. Turn this into a configure option to make builds deterinistic.
+
+RP 2020/2/19
+Signed-off-by: Richard Purdie <[email protected]>
+Upstream-Status: Pending
+
+Index: gstreamer-1.16.1/libs/gst/helpers/meson.build
+===================================================================
+--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build
++++ gstreamer-1.16.1/libs/gst/helpers/meson.build
+@@ -73,7 +73,12 @@ if have_ptp
+     endif
+   endif
+ 
+-  setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  setcap_feature = get_option('setcap')
++  if setcap_feature.disabled()
++    setcap = find_program('dontexist', required : false)
++  else
++    setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  endif
+ 
+   # user/group to change to in gst-ptp-helper
+   ptp_helper_setuid_user = get_option('ptp-helper-setuid-user')
+Index: gstreamer-1.16.1/meson_options.txt
+===================================================================
+--- gstreamer-1.16.1.orig/meson_options.txt
++++ gstreamer-1.16.1/meson_options.txt
+@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va
+ option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind')
+ option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces')
+ option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files')
++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap')
+ 
+ # Common feature options
+ option('examples', type : 'feature', value : 'auto', yield : true)
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +2 -0
index 6b8a5a0eb01..68f5ca649fe 100644
@@ -21,6 +21,7 @@ SRC_URI = " \
     file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
     file://0003-meson-Add-valgrind-feature.patch \
     file://0004-meson-Add-option-for-installed-tests.patch \
+    file://capfix.patch \
 "
 SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8"
 SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d"
@@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
 PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
 PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled"
+PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap"
 
 # TODO: put this in a gettext.bbclass patch
 def gettext_oemeson(d):
Signature · 1 line
2.25.0
#1 lore raw
Quoted 2 lines · Richard Purdie

+PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap"

I think this should also depend on whatever native recipe provides the setcap binary, so we don't depend on host setcap at all?

Alex

#2 lore raw
Quoted 7 lines · Alexander Kanavin
Quoted 2 lines · Richard Purdie

+PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-
Dsetcap=disabled,libcap"

I think this should also depend on whatever native recipe provides the setcap binary, so we don't depend on host setcap at all?

Right, it needs libcap-native too, good point. I'll tweak.

Cheers,

Richard

#3 lore raw
In reply to Richard Purdie

Hi,

Quoted 28 lines · Richard Purdie

Add an option to avoid builds depending on the presence of setcap from the host system.

---
  .../gstreamer/gstreamer1.0/capfix.patch       | 37 +++++++++++++++++++
  .../gstreamer/gstreamer1.0_1.16.1.bb          |  2 +
  2 files changed, 39 insertions(+)

create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file +12 -0
new file mode 100644
index 00000000000..7ca3d5ad4a6
@@ -0,0 +1,37 @@
+Currently gstreamer configuration depends on whether setcap is found on the host
+system. Turn this into a configure option to make builds deterinistic.
+
+RP 2020/2/19
+Signed-off-by: Richard Purdie <[email protected]>
+Upstream-Status: Pending
+
+Index: gstreamer-1.16.1/libs/gst/helpers/meson.build
+===================================================================
+--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build
++++ gstreamer-1.16.1/libs/gst/helpers/meson.build
+@@ -73,7 +73,12 @@ if have_ptp

meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch line 22

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file +10 -0
+     endif
+   endif
+
+-  setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  setcap_feature = get_option('setcap')
++  if setcap_feature.disabled()
++    setcap = find_program('dontexist', required : false)
++  else
++    setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  endif

I think this can be simplified by using get_option() directly for the "required" argument:

setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : get_option('setcap'))

// Martin

Quoted 36 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file +15 -0
+
+   # user/group to change to in gst-ptp-helper
+   ptp_helper_setuid_user = get_option('ptp-helper-setuid-user')
+Index: gstreamer-1.16.1/meson_options.txt
+===================================================================
+--- gstreamer-1.16.1.orig/meson_options.txt
++++ gstreamer-1.16.1/meson_options.txt
+@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va
+ option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind')
+ option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces')
+ option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files')
++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap')
+
+ # Common feature options
+ option('examples', type : 'feature', value : 'auto', yield : true)
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +2 -0
index 6b8a5a0eb01..68f5ca649fe 100644
@@ -21,6 +21,7 @@ SRC_URI = " \
      file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
      file://0003-meson-Add-valgrind-feature.patch \
      file://0004-meson-Add-option-for-installed-tests.patch \
+    file://capfix.patch \
  "
  SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8"
  SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d"
@@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
  PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils"
  PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion"
  PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled"
+PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap"
 
  # TODO: put this in a gettext.bbclass patch
  def gettext_oemeson(d):
#4 lore raw
Quoted 43 lines · Martin Hundebøll
Quoted 28 lines · Richard Purdie

Add an option to avoid builds depending on the presence of setcap from the host system.

---
  .../gstreamer/gstreamer1.0/capfix.patch       | 37 +++++++++++++++++++
  .../gstreamer/gstreamer1.0_1.16.1.bb          |  2 +
  2 files changed, 39 insertions(+)

create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file +12 -0
new file mode 100644
index 00000000000..7ca3d5ad4a6
@@ -0,0 +1,37 @@
+Currently gstreamer configuration depends on whether setcap is found on the host
+system. Turn this into a configure option to make builds deterinistic.
+
+RP 2020/2/19
+Signed-off-by: Richard Purdie <[email protected]>
+Upstream-Status: Pending
+
+Index: gstreamer-1.16.1/libs/gst/helpers/meson.build
+===================================================================
+--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build
++++ gstreamer-1.16.1/libs/gst/helpers/meson.build
+@@ -73,7 +73,12 @@ if have_ptp

meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch line 22

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file +10 -0
+     endif
+   endif
+
+-  setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  setcap_feature = get_option('setcap')
++  if setcap_feature.disabled()
++    setcap = find_program('dontexist', required : false)
++  else
++    setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
++  endif

I think this can be simplified by using get_option() directly for the "required" argument:

Quoted 2 lines

setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : get_option('setcap'))

Yes, that looks better. I'm no meson expert, this is the first time I've touched it.

I'd love if it someone was able to get this resolved with upstream.

I've been trying to work on getting various things fixed upstream (e.g. some of the perl changes) but I'm having to take a practical view in some areas. Getting the autobuilder stable/working sanely is currently more of a priority than getting involved in a discussion with upstream on something I know little about :/.

I've merged this patch but if anyone wants to improve it, I'm fine with that.

Cheers,

Richard