diff --git a/bnc#96864-ocfs2console-fix-starting-failure.patch b/bnc#96864-ocfs2console-fix-starting-failure.patch new file mode 100644 index 0000000..b01607e --- /dev/null +++ b/bnc#96864-ocfs2console-fix-starting-failure.patch @@ -0,0 +1,47 @@ +From 5cf4d29df66c9a539d686f7646a70cb312899f7f Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Thu, 17 Mar 2016 11:15:25 +0800 +Subject: [PATCH] ocfs2console: fix starting failure + +ocfs2console failed to start with this errors: +ImportError: /usr/lib64/python2.7/site-packages/ocfs2interface/o2cbmodule.so: undefined +symbol: cmap_get_string +ImportError: ocfs2console/ocfs2interface/o2cbmodule.so: undefined +symbol: ocfs2_free + +The first is caused by commit: 9be25f2fadf7 (Get cluster list info from corosync); +As for the second, actually, I don't know when it slipped in, but much likely from +when someone use ocfs2_free somewhere. + +Signed-off-by: Eric Ren +--- + ocfs2console/ocfs2interface/Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile +index 5409455..f49d998 100644 +--- a/ocfs2console/ocfs2interface/Makefile ++++ b/ocfs2console/ocfs2interface/Makefile +@@ -21,6 +21,10 @@ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb + endif + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + ++ifneq ($(BUILD_CMAP_SUPPORT),) ++LIBO2CB_LIBS += -lcmap ++endif ++ + ifdef HAVE_BLKID + BLKID_DEPS = + else +@@ -103,7 +107,7 @@ ocfs2module.so: $(OCFS2_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) + $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) + + o2cbmodule.so: $(O2CB_OBJS) $(LIBO2CB_DEPS) +- $(LINK) -shared $(LIBO2CB_LIBS) $(COM_ERR_LIBS) ++ $(LINK) -shared ${LIBOCFS2_LIBS} $(LIBO2CB_LIBS) $(COM_ERR_LIBS) + + install-pylib: + $(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2interface +-- +2.6.2 + diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 62b8ece..5493d37 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 17 04:00:04 UTC 2016 - zren@suse.com + +- Add bnc#96864-ocfs2console-fix-starting-failure.patch + ------------------------------------------------------------------- Tue Dec 22 03:23:50 UTC 2015 - zren@suse.com diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index a601b9e..ec56ed0 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -44,6 +44,7 @@ Patch403: 0005-do-not-write-sysconfig-if-status-not-changed.patch Patch404: 0006-o2cb-mount-debugfs-when-load-config.patch Patch405: 0007-vendor-Add-vendor-files-for-sles12.patch Patch406: 0008-ocfs2-tools-add-systemd-support-fix.patch +Patch501: bnc#96864-ocfs2console-fix-starting-failure.patch BuildRequires: autoconf BuildRequires: e2fsprogs-devel @@ -156,6 +157,7 @@ OCFS2 filesystem. %patch404 -p1 %patch405 -p1 %patch406 -p1 +%patch501 -p1 %build export PROJECT="ocfs2-tools"