Compare commits
No commits in common. "master" and "f29" have entirely different histories.
|
|
@ -1,48 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 4ff2ee858381ec4da59bdfdf0e6d33a62a83293c Mon Sep 17 00:00:00 2001
|
||||
From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
|
||||
Date: Thu, 25 Jan 2018 13:50:51 +0100
|
||||
Subject: [PATCH] libo2dlm: dlopen libdlm_lt.so.3 instead of libdlm_lt.so
|
||||
|
||||
Because libdlm_lt.so is only shipped in the libdlm-dev package.
|
||||
---
|
||||
libo2dlm/o2dlm.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libo2dlm/o2dlm.c b/libo2dlm/o2dlm.c
|
||||
index 0a2f6627..ad590a66 100644
|
||||
--- a/libo2dlm/o2dlm.c
|
||||
+++ b/libo2dlm/o2dlm.c
|
||||
@@ -803,7 +803,7 @@ static errcode_t load_fsdlm(struct o2dlm_ctxt *ctxt)
|
||||
goto out;
|
||||
}
|
||||
|
||||
- ctxt->ct_lib_handle = dlopen("libdlm_lt.so",
|
||||
+ ctxt->ct_lib_handle = dlopen("libdlm_lt.so.3",
|
||||
RTLD_NOW | RTLD_LOCAL);
|
||||
if (!ctxt->ct_lib_handle)
|
||||
goto out;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
Summary: Tools for managing the Oracle Cluster Filesystem 2
|
||||
Name: ocfs2-tools
|
||||
Version: 1.8.5
|
||||
Release: 11%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: GPLv2
|
||||
Source0: https://github.com/markfasheh/%{name}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||
# applied in upstream git 0ffd58b2
|
||||
|
|
@ -21,10 +21,6 @@ Patch4: 0001-Update-FSF-address-in-ipwidget.py.patch
|
|||
Patch5: 0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
|
||||
# https://github.com/markfasheh/ocfs2-tools/pull/33
|
||||
Patch6: 0001-Fix-build-with-glibc-2.28.patch
|
||||
# For Fedora python2 deprecation
|
||||
Patch7: 0001-Explicit-call-Python-2-command.patch
|
||||
# https://github.com/markfasheh/ocfs2-tools/pull/27
|
||||
Patch8: 0001-libo2dlm-dlopen-libdlm_lt.so.3-instead-of-libdlm_lt..patch
|
||||
URL: https://github.com/markfasheh/ocfs2-tools
|
||||
Requires: bash
|
||||
Requires: coreutils
|
||||
|
|
@ -100,8 +96,6 @@ 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
|
||||
|
||||
|
|
@ -201,19 +195,6 @@ chmod 755 %{buildroot}/%{python2_sitearch}/ocfs2interface/*.so
|
|||
%{_includedir}/ocfs2/*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.5-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.8.5-10
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sun Sep 23 2018 Robin Lee <cheeselee@fedoraproject.org> - 1.8.5-8
|
||||
- Apply patch to change python-config to python2-config
|
||||
- Apply patch to load dlm_lt by soname
|
||||
|
||||
* Sun Jul 15 2018 Robin Lee <cheeselee@fedoraproject.org> - 1.8.5-7
|
||||
- Fix python2_sitearch macro
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue