From d5cc46e3d185dcd32e2ef099b2ce38e1a7f95eee Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Sat, 10 Nov 2018 16:29:07 +0100 Subject: [PATCH] ipsec: Use @PYTHON@ directly instead of "/usr/bin/env python" 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 Fixes: 22c5eafb6efa ("ipsec: reintroduce IPsec support for tunneling") Signed-off-by: Timothy Redaelli Signed-off-by: Ben Pfaff --- configure.ac | 1 + ipsec/automake.mk | 6 +++--- ipsec/{ovs-monitor-ipsec => ovs-monitor-ipsec.in} | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename ipsec/{ovs-monitor-ipsec => ovs-monitor-ipsec.in} (99%) diff --git a/configure.ac b/configure.ac index 2b3800310..bb726f89e 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..66515e8f8 100644 --- a/ipsec/automake.mk +++ b/ipsec/automake.mk @@ -5,6 +5,6 @@ # notice and this notice are preserved. This file is offered as-is, # without warranty of any kind. -EXTRA_DIST += \ - ipsec/ovs-monitor-ipsec -FLAKE8_PYFILES += ipsec/ovs-monitor-ipsec +bin_SCRIPTS += 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");