49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
From 5ad9fc097fd96c4872b08cf343f7c42f4ea18334 Mon Sep 17 00:00:00 2001
|
|
From: Robin Lee <cheeselee@fedoraproject.org>
|
|
Date: Sat, 22 Sep 2018 23:03:59 +0800
|
|
Subject: [PATCH] Explicit call Python 2 command
|
|
|
|
---
|
|
ocfs2console/ocfs2console | 2 +-
|
|
ocfs2console/ocfs2interface/Makefile | 8 ++++----
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/ocfs2console/ocfs2console b/ocfs2console/ocfs2console
|
|
index 5130d52f..6c713780 100755
|
|
--- a/ocfs2console/ocfs2console
|
|
+++ b/ocfs2console/ocfs2console
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python -W ignore::DeprecationWarning
|
|
+#!/usr/bin/python2 -W ignore::DeprecationWarning
|
|
|
|
from ocfs2interface.about import process_args
|
|
nodeconf = process_args()
|
|
diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile
|
|
index 7c7c9b1c..4964bce2 100644
|
|
--- a/ocfs2console/ocfs2interface/Makefile
|
|
+++ b/ocfs2console/ocfs2interface/Makefile
|
|
@@ -97,16 +97,16 @@ INSTALL_RULES = install-pylib
|
|
DIST_FILES = $(PLIST_CFILES) $(PLIST_HFILES) $(GIDLE_CFILES) $(OCFS2_CFILES) $(O2CB_CFILES) $(PYSRC) $(addsuffix .in,$(BUILT_PYSRC))
|
|
|
|
plistmodule.so: $(PLIST_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) $(BLKID_DEPS)
|
|
- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(BLKID_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS) $(shell python-config --libs)
|
|
+ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(BLKID_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS) $(shell python2-config --libs)
|
|
|
|
gidlemodule.so: $(GIDLE_OBJS)
|
|
- $(LINK) -shared $(GLIB_LIBS) $(shell python-config --libs)
|
|
+ $(LINK) -shared $(GLIB_LIBS) $(shell python2-config --libs)
|
|
|
|
ocfs2module.so: $(OCFS2_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
|
|
- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) $(shell python-config --libs)
|
|
+ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) $(shell python2-config --libs)
|
|
|
|
o2cbmodule.so: $(O2CB_OBJS) $(LIBO2CB_DEPS)
|
|
- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(shell python-config --libs)
|
|
+ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(shell python2-config --libs)
|
|
|
|
install-pylib:
|
|
$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2interface
|
|
--
|
|
2.17.1
|
|
|