From 95f740625a6e326ebbf015aa9b923b58af09e01e Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Sun, 23 Sep 2018 14:34:11 +0800 Subject: [PATCH] Fix python2 path in shebang --- 0001-Explicit-call-Python-2-command.patch | 15 +++++++++++++-- ocfs2-tools.spec | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/0001-Explicit-call-Python-2-command.patch b/0001-Explicit-call-Python-2-command.patch index 3735fc6..ff5bfbc 100644 --- a/0001-Explicit-call-Python-2-command.patch +++ b/0001-Explicit-call-Python-2-command.patch @@ -1,12 +1,23 @@ -From a32e9de8fd3d6965f76d04a94a39ea4ba8be7a3c Mon Sep 17 00:00:00 2001 +From 5ad9fc097fd96c4872b08cf343f7c42f4ea18334 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Sat, 22 Sep 2018 23:03:59 +0800 Subject: [PATCH] Explicit call Python 2 command --- + ocfs2console/ocfs2console | 2 +- ocfs2console/ocfs2interface/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + 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 diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index dccc600..7855ff0 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -100,6 +100,8 @@ develop OCFS2 filesystem-specific programs. %patch2 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 # remove -Wno-format to prevent conflict with rpm optflags sed -i -e 's/-Wno-format//g' {o2info,o2image,o2monitor}/Makefile