diff options
author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-08-29 11:09:27 -0400 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-09-03 09:14:44 +0000 |
commit | af0d5a9b5375a5cd87ac10b429e2b9934718ce5b (patch) | |
tree | ae376c8ca9c6b643ea615feff5d946d48e0363ee /events | |
parent | eda69f2e327f5f65d14190eed1821a0f45b2f914 (diff) |
core: python3
see https://review.gluster.org/#/c/19788/,
https://review.gluster.org/#/c/19871/,
https://review.gluster.org/#/c/19952/,
https://review.gluster.org/#/c/20104/,
https://review.gluster.org/#/c/20162/,
https://review.gluster.org/#/c/20185/,
https://review.gluster.org/#/c/20207/,
https://review.gluster.org/#/c/20227/,
https://review.gluster.org/#/c/20307/,
https://review.gluster.org/#/c/20320/,
https://review.gluster.org/#/c/20332/,
https://review.gluster.org/#/c/20364/,
https://review.gluster.org/#/c/20441/, and
https://review.gluster.org/#/c/20484
shebangs changed from /usr/bin/python2 to /usr/bin/python3.
(Reminder, various distribution packaging guidelines require use
of explicit python version and don't allow '#!/usr/bin/env python',
regardless of how handy that idiom may be.)
glusterfs.spec(.in) package python{2,3}-gluster and python2 or
python3 dependencies as appropriate.
configure(.ac):
+ test for and use python2 or python3 as appropriate. If build
machine has python2 and python3, use python3. Override by
setting PYTHON=/usr/bin/python2 when running configure.
+ PYTHONDEV_CPPFLAGS from python[23]-config --includes is a
better match to the original python sysconfig.get_python_inc().
All those other extraneous flags breaks the build.
+ Only change the shebangs once. Changing them over and over
again, e.g., during a `make glusterrpms` in extras/LinuxRPM
just sends make (is it really make that's looping?) into an
infinite loop. If you figure out why, let me know.
+ Oldest python2 is python2.6 on CentOS 6 and Debian 8 (Jessie).
Everything else has 2.7 or 3.x
+ logic from https://review.gluster.org/c/glusterfs/+/21050, which
needs to be removed/merged after that patch is merged.
Builds on CentOS 6, CentOS 7, Fedora 28, Fedora rawhide, and the
mysterious RHEL > 7.
Change-Id: Idae21d3b6f58b32372e1daa0d234e491e563198f
updates: #411
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'events')
-rw-r--r-- | events/eventskeygen.py | 2 | ||||
-rw-r--r-- | events/src/gf_event.py | 2 | ||||
-rw-r--r-- | events/src/glustereventsd.py | 2 | ||||
-rw-r--r-- | events/src/peer_eventsapi.py | 2 | ||||
-rw-r--r-- | events/tools/eventsdash.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/events/eventskeygen.py b/events/eventskeygen.py index 4ccedea8f9e..e28ebe9b7e6 100644 --- a/events/eventskeygen.py +++ b/events/eventskeygen.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/src/gf_event.py b/events/src/gf_event.py index fd272434242..1454063c863 100644 --- a/events/src/gf_event.py +++ b/events/src/gf_event.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/src/glustereventsd.py b/events/src/glustereventsd.py index b61d1a1b28b..324695ecea3 100644 --- a/events/src/glustereventsd.py +++ b/events/src/glustereventsd.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/src/peer_eventsapi.py b/events/src/peer_eventsapi.py index fb11e12deb4..fbfb1d66bb2 100644 --- a/events/src/peer_eventsapi.py +++ b/events/src/peer_eventsapi.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> diff --git a/events/tools/eventsdash.py b/events/tools/eventsdash.py index 4346c834ee4..6479ea59da6 100644 --- a/events/tools/eventsdash.py +++ b/events/tools/eventsdash.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> |