diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-14 09:45:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-14 14:24:52 +0200 |
| commit | 8052f483d4abb1cbbac1e1d869b4b560bc9acbbb (patch) | |
| tree | 4f9104c543eab544ce6897da09bf5f1d3eade4f5 /patches | |
| parent | f95699a5412a9dc47ce81cade915e7cf972f113a (diff) | |
| download | ptxdist-8052f483d4abb1cbbac1e1d869b4b560bc9acbbb.tar.gz ptxdist-8052f483d4abb1cbbac1e1d869b4b560bc9acbbb.tar.xz | |
gpsd: improve python bindings
- The gps Python modules imports 'hashlib' so PYTHON3_SSL is needed
- GPSD_CONF_OPT uses PYTHON3_MAJORMINOR so it must be assigned with '='
- don't make Python files without shebang executable.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
3 files changed, 27 insertions, 2 deletions
diff --git a/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch b/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch index 72f7d3a31..d7c6945ae 100644 --- a/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch +++ b/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch @@ -1,6 +1,7 @@ From: Ladislav Michl <ladis@linux-mips.org> Date: Sun, 2 Feb 2020 09:45:04 +0100 -Subject: [PATCH] SConstruct: Use 'target' option to decide whenewer to restart systemd +Subject: [PATCH] SConstruct: Use 'target' option to decide whenewer to restart + systemd --- SConstruct | 2 +- diff --git a/patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch b/patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch new file mode 100644 index 000000000..809d98a6d --- /dev/null +++ b/patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch @@ -0,0 +1,23 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 14 Aug 2020 09:44:34 +0200 +Subject: [PATCH] SConstruct: don't make python files without shebang + executable + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + SConstruct | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index 434141f3e46b..d303c3aa6d20 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -2116,7 +2116,7 @@ for fn in templated: + env.Default(builder) + # set read-only to alert people trying to edit the files. + env.AddPostAction(builder, 'chmod -w $TARGET') +- if ((fn.endswith(".py.in") or ++ if ((fn[:-3] in ['contrib/skyview2svg.py', 'gps/gps.py'] or + fn[:-3] in python_progs or + fn[:-3] in ['contrib/ntpshmviz', 'contrib/webgps'])): + # set python files to executable diff --git a/patches/gpsd-3.21/series b/patches/gpsd-3.21/series index 33da89cc5..59c905551 100644 --- a/patches/gpsd-3.21/series +++ b/patches/gpsd-3.21/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-Search-for-ncursesw-pkgconfig.patch 0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch -# 207be982e9eb34d250a9e62946dcd881 - git-ptx-patches magic +0003-SConstruct-don-t-make-python-files-without-shebang-e.patch +# ac113373083222a9a340e9ddf30a7fd2 - git-ptx-patches magic |