| Message ID | b0c50a13a41790eb60238fdf52ea990d96f9b98b.1541863586.git.tredaelli@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] ipsec: Use @PYTHON@ directly instead of "/usr/bin/env python" | expand |
On Sat, Nov 10, 2018 at 04:29:07PM +0100, Timothy Redaelli wrote: > Using "/usr/bin/env" is against Fedora Packaging Guidelines [1]. > > Moreover, in this specific case, it also prevent "make rpm-fedora" to > successfully complete on "Fedora Rawhide" since "#!/usr/bin/env python" > must not be used anymore [2]. > > [1] https://fedoraproject.org/wiki/Packaging:Guidelines#Shebang_lines > [2] https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error > > CC: Qiuyu Xiao <qiuyu.xiao.qyx@gmail.com> > Fixes: 22c5eafb6efa ("ipsec: reintroduce IPsec support for tunneling") > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> Thanks. I had to fold the following in to make it work when the build directory is not the same as the source directory. I applied it to master. diff --git a/configure.ac b/configure.ac index 2b3800310231..bb726f89e251 100644 --- a/configure.ac +++ b/configure.ac @@ -208,6 +208,7 @@ AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp]) AC_CONFIG_COMMANDS([utilities/bugtool/dummy], [:]) AC_CONFIG_COMMANDS([ovn/dummy], [:]) AC_CONFIG_COMMANDS([ovn/utilities/dummy], [:]) +AC_CONFIG_COMMANDS([ipsec/dummy], [:]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
diff --git a/ipsec/automake.mk b/ipsec/automake.mk index 1e530cb42..445b37ac9 100644 --- a/ipsec/automake.mk +++ b/ipsec/automake.mk @@ -5,6 +5,9 @@ # notice and this notice are preserved. This file is offered as-is, # without warranty of any kind. -EXTRA_DIST += \ +bin_SCRIPTS += \ ipsec/ovs-monitor-ipsec -FLAKE8_PYFILES += ipsec/ovs-monitor-ipsec + +EXTRA_DIST += \ + ipsec/ovs-monitor-ipsec.in +FLAKE8_PYFILES += ipsec/ovs-monitor-ipsec.in diff --git a/ipsec/ovs-monitor-ipsec b/ipsec/ovs-monitor-ipsec.in similarity index 99% rename from ipsec/ovs-monitor-ipsec rename to ipsec/ovs-monitor-ipsec.in index c93081d32..4710be039 100755 --- a/ipsec/ovs-monitor-ipsec +++ b/ipsec/ovs-monitor-ipsec.in @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! @PYTHON@ # Copyright (c) 2017 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License");
Using "/usr/bin/env" is against Fedora Packaging Guidelines [1]. Moreover, in this specific case, it also prevent "make rpm-fedora" to successfully complete on "Fedora Rawhide" since "#!/usr/bin/env python" must not be used anymore [2]. [1] https://fedoraproject.org/wiki/Packaging:Guidelines#Shebang_lines [2] https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error CC: Qiuyu Xiao <qiuyu.xiao.qyx@gmail.com> Fixes: 22c5eafb6efa ("ipsec: reintroduce IPsec support for tunneling") Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> --- Detected by my Fedora/CentOS nigthly CI: https://gitlab.com/drizzt/ovs/pipelines --- ipsec/automake.mk | 7 +++++-- ipsec/{ovs-monitor-ipsec => ovs-monitor-ipsec.in} | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) rename ipsec/{ovs-monitor-ipsec => ovs-monitor-ipsec.in} (99%)