summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-04-07 16:24:30 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-23 10:45:02 +0200
commit9737ecf6e9b837578ef58b8ff9b01ff9d4255a06 (patch)
treee2c30f80ee742cb4a676d05335712dfc611d43f6
parentd60ef8cc8930d1cdb81c1ddc86933c3d8a207902 (diff)
downloadptxdist-9737ecf6e9b837578ef58b8ff9b01ff9d4255a06.tar.gz
gst-validate1: fix gst-validate-launcher
Select Python SSL support, otherwise hashlib is not available and this is needed to run gst-validate-launcher. gst-validate-launcher looks at *.py files to find the 'test manager'. This does not work if only *.pyc files are installed. So install *.py instead for now. Without this, running gst-validate-launcher fails with: Could not load testsuite: <module '...' from '...'> maybe because of missing TestManager Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/gst-validate1.in1
-rw-r--r--rules/gst-validate1.make8
2 files changed, 4 insertions, 5 deletions
diff --git a/rules/gst-validate1.in b/rules/gst-validate1.in
index a11da5a..0a429e2 100644
--- a/rules/gst-validate1.in
+++ b/rules/gst-validate1.in
@@ -8,6 +8,7 @@ menuconfig GST_VALIDATE1
select CAIRO if GST_VALIDATE1_VIDEO
select CAIRO_PNG if GST_VALIDATE1_VIDEO
select PYTHON3 if GST_VALIDATE1_LAUNCHER
+ select PYTHON3_SSL if GST_VALIDATE1_LAUNCHER
prompt "gst-validate "
help
GstValidate is a tool that allows GStreamer developers to check
diff --git a/rules/gst-validate1.make b/rules/gst-validate1.make
index c38d36a..41887f0 100644
--- a/rules/gst-validate1.make
+++ b/rules/gst-validate1.make
@@ -108,11 +108,9 @@ ifdef PTXCONF_GST_VALIDATE1_LAUNCHER
@$(call install_copy, gst-validate1, 0, 0, 0755, -, \
/usr/bin/gst-validate-launcher)
- @cd $(GST_VALIDATE1_PKGDIR)/usr/lib/gst-validate-launcher/python && \
- for file in `find launcher/ -name "*.pyc"`; do \
- $(call install_copy, gst-validate1, 0, 0, 0644, -, \
- /usr/lib/gst-validate-launcher/python/$${file}); \
- done
+ # internal magic is broken when .py files are missing
+ $(call install_glob, gst-validate1, 0, 0, -, \
+ /usr/lib/gst-validate-launcher/python,*.py)
endif
@$(call install_finish, gst-validate1)