misc: Update #!env calls for python to explicit version

In some newer Linux distributions, env python default to Python 3.0. This
patch explicitly uses "python2" instead of just "python" for all scripts
that use #!

Reported-by: Sanchayan Maity <maitysanchayan@gmail.com>
Signed-off-by: Jason Lowe-Power <jason@lowepower.com>

diff --git a/ext/mcpat/regression/regression.py b/ext/mcpat/regression/regression.py
index aabfec75dca4b3d677991ecacec76d83c4d37b18..0115a56256f9bbe68fa167a137c673a25cc267cf 100755 (executable)
--- a/ext/mcpat/regression/regression.py
+++ b/ext/mcpat/regression/regression.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2010-2013 Advanced Micro Devices, Inc.
 # All rights reserved.

diff --git a/ext/mcpat/regression/verify_output.py b/ext/mcpat/regression/verify_output.py
index c37663c8f2b6d2a53dd460fe03873c962ffbb19a..aaa75929f6aaa32816bb7cd13110a99e0bcbda19 100644 (file)
--- a/ext/mcpat/regression/verify_output.py
+++ b/ext/mcpat/regression/verify_output.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2010-2013 Advanced Micro Devices, Inc.
 # All rights reserved.

diff --git a/ext/ply/example/classcalc/calc.py b/ext/ply/example/classcalc/calc.py
index bf0d065e483bdaddacd46b584f6c6f5324c883b8..f3591977b6b27ddb93a680be32199658b6638fcb 100755 (executable)
--- a/ext/ply/example/classcalc/calc.py
+++ b/ext/ply/example/classcalc/calc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # -----------------------------------------------------------------------------
 # calc.py

diff --git a/ext/ply/example/newclasscalc/calc.py b/ext/ply/example/newclasscalc/calc.py
index a12e498b21155912431c461952600f12502aa5a5..3461f243e9862b9520c64bf3a5f2723cef633b68 100755 (executable)
--- a/ext/ply/example/newclasscalc/calc.py
+++ b/ext/ply/example/newclasscalc/calc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # -----------------------------------------------------------------------------
 # calc.py

diff --git a/src/unittest/genini.py b/src/unittest/genini.py
index a969a6ee46298d93c4fa14b9aae4309ff0dbdb96..19e6442de663ffa1a3c68410926b8dd34b106d02 100755 (executable)
--- a/src/unittest/genini.py
+++ b/src/unittest/genini.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.
 #

diff --git a/tests/testing/__init__.py b/tests/testing/__init__.py
index e7c83da100585ac88d68088ac9e4c47141381b3d..1bc471108f4305a2e5d611ba4876b683e4c34d96 100644 (file)
--- a/tests/testing/__init__.py
+++ b/tests/testing/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/tests/testing/helpers.py b/tests/testing/helpers.py
index 757167a4b0cb87b7c77d80e38bc95d8c43d20794..e2f3fbe7debf35ea4cdfbf4ac29cc5ab64e2aa13 100755 (executable)
--- a/tests/testing/helpers.py
+++ b/tests/testing/helpers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/tests/testing/results.py b/tests/testing/results.py
index 1df14bc4f56b54485e9f907d114ae1ad3c38c0f3..387362a75f577fc428bd794bc95f363208dd9892 100644 (file)
--- a/tests/testing/results.py
+++ b/tests/testing/results.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/tests/testing/tests.py b/tests/testing/tests.py
index 6f887ff804547428b1cc8f0e8e662ccefd139818..c9a2a06b20f09ce70a901cbee3c9389edca7876a 100644 (file)
--- a/tests/testing/tests.py
+++ b/tests/testing/tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/tests/testing/units.py b/tests/testing/units.py
index 6214c8f143d5e39a15e4e35dd3e0e9579c8d3549..808763fcc2b314ce86c179a49ed9cbe553980118 100644 (file)
--- a/tests/testing/units.py
+++ b/tests/testing/units.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/tests/tests.py b/tests/tests.py
index 85b194c56204200c2365f21a307092ed406856fe..136c879aa41c9173b2cb8b9e3172c3af509622b3 100755 (executable)
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/util/batch/job.py b/util/batch/job.py
index 9d7ecca8c903718d31e73b3ba385af5b8f682615..471b882514b18b249b8839e5ac3aa13f5c54868c 100755 (executable)
--- a/util/batch/job.py
+++ b/util/batch/job.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2006 The Regents of The University of Michigan
 # All rights reserved.
 #

diff --git a/util/batch/send.py b/util/batch/send.py
index e7bf1958f51ffa1a9617bab31427817401ac0227..44a4f2879ce0a069c8724fab71b1c5d20409822d 100755 (executable)
--- a/util/batch/send.py
+++ b/util/batch/send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2006 The Regents of The University of Michigan
 # All rights reserved.
 #

diff --git a/util/checkpoint-tester.py b/util/checkpoint-tester.py
index 530462758d7631957f784be358ce3a7c6e5a0189..bec4709fcd5a9f5f360c40bcf7556d881aa4593d 100755 (executable)
--- a/util/checkpoint-tester.py
+++ b/util/checkpoint-tester.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2010 Advanced Micro Devices, Inc.
 # All rights reserved.

diff --git a/util/compile b/util/compile
index 627e78b741cf1178aa2e8a0616d56bb0ba37eaf2..f3040f7949e0f82be0b8197947a9d525c685b389 100755 (executable)
--- a/util/compile
+++ b/util/compile
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2006 The Regents of The University of Michigan
 # All rights reserved.
 #

diff --git a/util/cpt_upgrader.py b/util/cpt_upgrader.py
index ffd5d701ba82c60f5f412167d20d4a0f85262d06..5102fd5a27959d57807f39941577112d389220f3 100755 (executable)
--- a/util/cpt_upgrader.py
+++ b/util/cpt_upgrader.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2012-2013,2015 ARM Limited
 # All rights reserved

diff --git a/util/decode_inst_dep_trace.py b/util/decode_inst_dep_trace.py
index 6e4030146f5b0145b7a8070e6d2074fd9df48b24..956a16133e6a113e8b6eb48f3f285e900fe13082 100755 (executable)
--- a/util/decode_inst_dep_trace.py
+++ b/util/decode_inst_dep_trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013 - 2015 ARM Limited
 # All rights reserved

diff --git a/util/decode_inst_trace.py b/util/decode_inst_trace.py
index 6915e714aa03b9743729e483f9c1861b2afbe081..ff5c73386bb7003cdfe4f1ba32e40cbdbcce265e 100755 (executable)
--- a/util/decode_inst_trace.py
+++ b/util/decode_inst_trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013-2014 ARM Limited
 # All rights reserved

diff --git a/util/decode_packet_trace.py b/util/decode_packet_trace.py
index 97d3441630902684f75ba9c7990df4eb249fa858..34a0d8bbce1c54eaa2c9f52846cc244f65a401e8 100755 (executable)
--- a/util/decode_packet_trace.py
+++ b/util/decode_packet_trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013-2014 ARM Limited
 # All rights reserved

diff --git a/util/dram_lat_mem_rd_plot.py b/util/dram_lat_mem_rd_plot.py
index 72e1528c317d6bb525287cb9806f254e6e1dc502..422b14049d504c5eb17f85f45ff91304b8eb87d5 100755 (executable)
--- a/util/dram_lat_mem_rd_plot.py
+++ b/util/dram_lat_mem_rd_plot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2015 ARM Limited
 # All rights reserved

diff --git a/util/dram_sweep_plot.py b/util/dram_sweep_plot.py
index f3fc32960dd9979964a203ad870091b00dbcd05d..5eb18b95aae1fa09619135c84156923b5c4cae17 100755 (executable)
--- a/util/dram_sweep_plot.py
+++ b/util/dram_sweep_plot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2014 ARM Limited
 # All rights reserved

diff --git a/util/encode_inst_dep_trace.py b/util/encode_inst_dep_trace.py
index e54e82d7010f1cc2310612cf9aa995d1946506f6..d8d5ba1435f52efe9fd5cd8c8b776f9fd89fd990 100755 (executable)
--- a/util/encode_inst_dep_trace.py
+++ b/util/encode_inst_dep_trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2015 ARM Limited
 # All rights reserved

diff --git a/util/encode_packet_trace.py b/util/encode_packet_trace.py
index 0734d43c8ed22f7aee90d1bc8026ac7a657f1198..c4d4616648aa49741a04a97f0991a7991f659a5d 100755 (executable)
--- a/util/encode_packet_trace.py
+++ b/util/encode_packet_trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013-2014 ARM Limited
 # All rights reserved

diff --git a/util/find_copyrights.py b/util/find_copyrights.py
index 697f4b728796337a8c78aa1d9d668758342caba3..8a12bc3b182f9912716ab03f02d407b97c2e09fe 100644 (file)
--- a/util/find_copyrights.py
+++ b/util/find_copyrights.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import os
 import re

diff --git a/util/git-pre-commit.py b/util/git-pre-commit.py
index 276e21fc5b64587f49e1433d94a51630ae41378f..1b93069da57f4b1c2ea0e84f03e2938be7ff6ed9 100755 (executable)
--- a/util/git-pre-commit.py
+++ b/util/git-pre-commit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/util/hgstyle.py b/util/hgstyle.py
index ecdec4b0fa7059d234bc71e699431732726f8897..da0cdeb90e0847724ce749c46b7c456a0da8316e 100755 (executable)
--- a/util/hgstyle.py
+++ b/util/hgstyle.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 # Copyright (c) 2014 ARM Limited
 # All rights reserved
 #

diff --git a/util/maint/git-patch-to-hg-patch b/util/maint/git-patch-to-hg-patch
index 6819cfcceb96593643add943fcb671ac25cf90a0..1b9e05d0959d03e196c8ec71fe65473ac98dfc2a 100755 (executable)
--- a/util/maint/git-patch-to-hg-patch
+++ b/util/maint/git-patch-to-hg-patch
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # This file originated from the moz-git-tools repo on GitHub
 # (https://github.com/mozilla/moz-git-tools), which contains the

diff --git a/util/memtest-soak.py b/util/memtest-soak.py
index 2ece09c2186b63b95a0b25757c198ab09c255cc5..b61d1c5b72b78a03b9c4bd8e28655579ad5fcef1 100755 (executable)
--- a/util/memtest-soak.py
+++ b/util/memtest-soak.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2015 ARM Limited
 # All rights reserved

diff --git a/util/minorview.py b/util/minorview.py
index 1a6b47b011bd83f307770e0ddafb0db8fdf8e1e3..39c63317995c152f848dff187863f68c80641aad 100755 (executable)
--- a/util/minorview.py
+++ b/util/minorview.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2013 ARM Limited
 # All rights reserved

diff --git a/util/o3-pipeview.py b/util/o3-pipeview.py
index 4d3a59a2945a90cf6d3d234182195c03c7d00b0f..08fd8d334e7069d1e7badd2f2aff24cb0c0de926 100755 (executable)
--- a/util/o3-pipeview.py
+++ b/util/o3-pipeview.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2011 ARM Limited
 # All rights reserved

diff --git a/util/oprofile-top.py b/util/oprofile-top.py
index aea9dfaddab0a293dd03486e5c404922074011f1..f6444064649f6af4c6bc57d16891c89056547332 100755 (executable)
--- a/util/oprofile-top.py
+++ b/util/oprofile-top.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.

diff --git a/util/pbs/job.py b/util/pbs/job.py
index 0fd3b4f9782ea03d21d6e01dceb1b04552271482..4c400310c153227da93fdd709344e6b3e3148858 100755 (executable)
--- a/util/pbs/job.py
+++ b/util/pbs/job.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.
 #

diff --git a/util/pbs/send.py b/util/pbs/send.py
index 54bba931da5dd320c6678a01e103a180c79cbc3d..62ab2e5b99f1526d0496eb3b74e67b2a8ed49cab 100755 (executable)
--- a/util/pbs/send.py
+++ b/util/pbs/send.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.
 #

diff --git a/util/protolib.py b/util/protolib.py
index e0507cdd46280683f7cf57aea0ab67b3bc24d977..47ac8768f4ab2f0b88cab7a4e7dcb028293657da 100644 (file)
--- a/util/protolib.py
+++ b/util/protolib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013 ARM Limited
 # All rights reserved

diff --git a/util/qdo b/util/qdo
index d53f3e9b18c98b6dc53df0f0300ba2047080e6ef..9ec9b8f520486e814b5668ef1e1121ea34570e18 100755 (executable)
--- a/util/qdo
+++ b/util/qdo
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2004-2005, 2007 The Regents of The University of Michigan
 # All rights reserved.

diff --git a/util/regress b/util/regress
index 5cc576b5d50490f9a5a6a6eb31f2c392ec4809d8..da71e65758d14813983fc6068ba0478d66527f86 100755 (executable)
--- a/util/regress
+++ b/util/regress
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 # Copyright (c) 2005-2007 The Regents of The University of Michigan
 # All rights reserved.
 #

diff --git a/util/slicc b/util/slicc
index 07bd73ffaff9a5033844b9efbd156d799c3de430..b4ccec0d8a0f2829bbf0a88c030fa5d5b02711be 100755 (executable)
--- a/util/slicc
+++ b/util/slicc
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2009 The Hewlett-Packard Development Company
 # All rights reserved.
 #

diff --git a/util/stats/stats.py b/util/stats/stats.py
index ea2210685b4cb10c5ff3c7d4130e6effede335fa..209108c77b06aa052642eca4727c0d28ff63a4a1 100755 (executable)
--- a/util/stats/stats.py
+++ b/util/stats/stats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2003-2004 The Regents of The University of Michigan
 # All rights reserved.

diff --git a/util/streamline/m5stats2streamline.py b/util/streamline/m5stats2streamline.py
index c65649e79cabe3dd7a8f8218504289edeb722c77..816d042dcc8629e04cbabbcf89e316cf8af2aff9 100755 (executable)
--- a/util/streamline/m5stats2streamline.py
+++ b/util/streamline/m5stats2streamline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2012, 2014 ARM Limited
 # All rights reserved

diff --git a/util/style.py b/util/style.py
index 15a99c8950d4c0eceb9df336b2cb335be6082c80..1dd7af34e95e16a33ffea600f0d4d1639d0d5c01 100755 (executable)
--- a/util/style.py
+++ b/util/style.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/util/style/__init__.py b/util/style/__init__.py
index e7c83da100585ac88d68088ac9e4c47141381b3d..1bc471108f4305a2e5d611ba4876b683e4c34d96 100644 (file)
--- a/util/style/__init__.py
+++ b/util/style/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/util/style/repo.py b/util/style/repo.py
index adcbdc95f12d9fe5bd9677b74e368395ab56395f..7e3b444c69dfd66b2b07fcae4aa12989771599e7 100644 (file)
--- a/util/style/repo.py
+++ b/util/style/repo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved

diff --git a/util/style/sort_includes.py b/util/style/sort_includes.py
index a35b0846807e394b4defff315170813e69080c54..d1a25ee6bbc5000825d8e28369cf6b5046485244 100644 (file)
--- a/util/style/sort_includes.py
+++ b/util/style/sort_includes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2014-2015 ARM Limited
 # All rights reserved

diff --git a/util/style/style.py b/util/style/style.py
index 9f3f0d0f0b50e839218e334eadcee3cda7c2b15c..317caa395fe946ac5a7af093dad13d35635b10ae 100644 (file)
--- a/util/style/style.py
+++ b/util/style/style.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 # Copyright (c) 2014, 2016 ARM Limited
 # All rights reserved
 #

diff --git a/util/style/verifiers.py b/util/style/verifiers.py
index 1be4536017f9ed355a563a1f4c5edd558d5684e4..89247dc4fee0f478d8066ed9c876076029c54d55 100644 (file)
--- a/util/style/verifiers.py
+++ b/util/style/verifiers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2014, 2016 ARM Limited
 # All rights reserved