From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [PATCH] gpsd: version bump 3.21 -> 3.22
Date: Fri, 25 Jun 2021 15:04:18 +0200 [thread overview]
Message-ID: <20210625130418.GE4015839@pengutronix.de> (raw)
In-Reply-To: <20210618061756.112489-1-ada@thorsis.com>
On Fri, Jun 18, 2021 at 08:17:56AM +0200, Alexander Dahl wrote:
> From: Ladislav Michl <ladis@linux-mips.org>
>
> As all python files have shebang now, we can drop 3rd patch.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Acked-by: Alexander Dahl <ada@thorsis.com>
> ---
>
> Notes:
> Sending this on behalf of Ladislav, because something does not work with his
> infrastructure currently. I looked over the patch and build tested it for
> platform v7a with ptxdist-2021.02.0 successfully. LGTM
>
> ...-make-python-files-without-shebang-e.patch | 23 -------------------
> patches/gpsd-3.21/series | 7 ------
> ...cript-Search-for-ncursesw-pkgconfig.patch} | 16 ++++++-------
> ...rget-option-to-decide-whenewer-to-r.patch} | 15 ++++++------
> .../0003-SConscript-don-t-use-lnsl.patch} | 14 +++++------
> patches/gpsd-3.22/series | 6 +++++
> rules/gpsd.make | 5 ++--
> 7 files changed, 32 insertions(+), 54 deletions(-)
> delete mode 100644 patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch
> delete mode 100644 patches/gpsd-3.21/series
> rename patches/{gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch => gpsd-3.22/0001-SConscript-Search-for-ncursesw-pkgconfig.patch} (70%)
> rename patches/{gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch => gpsd-3.22/0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch} (61%)
> rename patches/{gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch => gpsd-3.22/0003-SConscript-don-t-use-lnsl.patch} (75%)
> create mode 100644 patches/gpsd-3.22/series
>
> 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
> deleted file mode 100644
> index 809d98a6d..000000000
> --- a/patches/gpsd-3.21/0003-SConstruct-don-t-make-python-files-without-shebang-e.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -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
This patch, or something like this is still needed. Otherwise
/usr/lib/python3.7/gps/__init__.py and /usr/lib/python3.7/gps/packet.py
will be executable.
Michael
> -
> -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
> deleted file mode 100644
> index bbfb1be7d..000000000
> --- a/patches/gpsd-3.21/series
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Search-for-ncursesw-pkgconfig.patch
> -0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch
> -0003-SConstruct-don-t-make-python-files-without-shebang-e.patch
> -0004-SConstruct-don-t-use-lnsl.patch
> -# a4f439aa9ecaa21523935c6cada0b0dc - git-ptx-patches magic
> diff --git a/patches/gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch b/patches/gpsd-3.22/0001-SConscript-Search-for-ncursesw-pkgconfig.patch
> similarity index 70%
> rename from patches/gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch
> rename to patches/gpsd-3.22/0001-SConscript-Search-for-ncursesw-pkgconfig.patch
> index c7b874c83..e2be484d3 100644
> --- a/patches/gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch
> +++ b/patches/gpsd-3.22/0001-SConscript-Search-for-ncursesw-pkgconfig.patch
> @@ -1,20 +1,20 @@
> From: Ladislav Michl <ladis@linux-mips.org>
> Date: Fri, 25 Oct 2019 14:18:30 +0200
> -Subject: [PATCH] Search for ncursesw pkgconfig
> +Subject: [PATCH] SConscript: Search for ncursesw pkgconfig
>
> PTXDist can be configured to build wide char version of ncurses
> -which SConstruct is unaware of.
> +which SConscript is unaware of.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> - SConstruct | 2 ++
> + SConscript | 2 ++
> 1 file changed, 2 insertions(+)
>
> -diff --git a/SConstruct b/SConstruct
> -index e15d63f6ede0..71643c428f26 100644
> ---- a/SConstruct
> -+++ b/SConstruct
> -@@ -1067,6 +1067,8 @@ else:
> +diff --git a/SConscript b/SConscript
> +index d0b0908ec5f0..4292e75229d6 100644
> +--- a/SConscript
> ++++ b/SConscript
> +@@ -1133,6 +1133,8 @@ if not cleaning and not helping:
> ncurseslibs = pkg_config('ncurses', rpath_hack=True)
> if config.CheckPKG('tinfo'):
> ncurseslibs += pkg_config('tinfo', rpath_hack=True)
> diff --git a/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch b/patches/gpsd-3.22/0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch
> similarity index 61%
> rename from patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch
> rename to patches/gpsd-3.22/0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch
> index d7c6945ae..9548735b0 100644
> --- a/patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch
> +++ b/patches/gpsd-3.22/0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch
> @@ -1,17 +1,18 @@
> 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
> +Subject: [PATCH] SConscript: Use 'target' option to decide whenewer to restart
> systemd
>
> +Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> - SConstruct | 2 +-
> + SConscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> -diff --git a/SConstruct b/SConstruct
> -index 71643c428f26..434141f3e46b 100644
> ---- a/SConstruct
> -+++ b/SConstruct
> -@@ -2853,7 +2853,7 @@ udev_install = Utility('udev-install', 'install', [
> +diff --git a/SConscript b/SConscript
> +index 4292e75229d6..50a2479d995d 100644
> +--- a/SConscript
> ++++ b/SConscript
> +@@ -3145,7 +3145,7 @@ udev_install = Utility('udev-install', 'install', [
>
> if env['systemd']:
> env.Requires(udev_install, systemd_install)
> diff --git a/patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch b/patches/gpsd-3.22/0003-SConscript-don-t-use-lnsl.patch
> similarity index 75%
> rename from patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch
> rename to patches/gpsd-3.22/0003-SConscript-don-t-use-lnsl.patch
> index e857f8faa..a21816d2c 100644
> --- a/patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch
> +++ b/patches/gpsd-3.22/0003-SConscript-don-t-use-lnsl.patch
> @@ -1,19 +1,19 @@
> From: Michael Olbrich <m.olbrich@pengutronix.de>
> Date: Fri, 13 Nov 2020 11:55:47 +0100
> -Subject: [PATCH] SConstruct: don't use -lnsl
> +Subject: [PATCH] SConscript: don't use -lnsl
>
> It may be found on Linux but is not actually needed.
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> - SConstruct | 8 +-------
> + SConscript | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> -diff --git a/SConstruct b/SConstruct
> -index d303c3aa6d20..ce627e93f65e 100644
> ---- a/SConstruct
> -+++ b/SConstruct
> -@@ -1113,13 +1113,7 @@ else:
> +diff --git a/SConscript b/SConscript
> +index bd741046d56b..4cf6af8071c5 100644
> +--- a/SConscript
> ++++ b/SConscript
> +@@ -1179,13 +1179,7 @@ if not cleaning and not helping:
> else:
> confdefs.append("/* #undef HAVE_LIBRT */\n")
>
> diff --git a/patches/gpsd-3.22/series b/patches/gpsd-3.22/series
> new file mode 100644
> index 000000000..45b3eb8db
> --- /dev/null
> +++ b/patches/gpsd-3.22/series
> @@ -0,0 +1,6 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-SConscript-Search-for-ncursesw-pkgconfig.patch
> +0002-SConscript-Use-target-option-to-decide-whenewer-to-r.patch
> +0003-SConscript-don-t-use-lnsl.patch
> +# 22a1bb00c3298707123a09b397fd475a - git-ptx-patches magic
> diff --git a/rules/gpsd.make b/rules/gpsd.make
> index 4389356d2..93be1bed3 100644
> --- a/rules/gpsd.make
> +++ b/rules/gpsd.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd
> #
> # Paths and names
> #
> -GPSD_VERSION := 3.21
> -GPSD_MD5 := 782e4b10193f225cc95c65528636d4f5
> +GPSD_VERSION := 3.22
> +GPSD_MD5 := c4a284ddb482318e8fdccf2903fb22c2
> GPSD := gpsd-$(GPSD_VERSION)
> GPSD_SUFFIX := tar.xz
> GPSD_URL := http://download.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX)
> @@ -101,6 +101,7 @@ GPSD_CONF_OPT = \
> profiling=$(call ptx/yesno, PTXCONF_GPSD_PROFILING) \
> python=$(call ptx/yesno, PTXCONF_GPSD_PYTHON) \
> python_libdir=/usr/lib/python$(PYTHON3_MAJORMINOR) \
> + python_shebang=/usr/bin/python$(PYTHON3_MAJORMINOR) \
> qt=no \
> rtcm104v2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V2) \
> rtcm104v3=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V3) \
>
> base-commit: e1f0f2abd3116fdcb5e3e3211321aef801e959ff
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-06-25 13:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 6:17 Alexander Dahl
2021-06-25 13:04 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210625130418.GE4015839@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox