diff --git a/bug-838705-change_dlm_lib.patch b/bug-838705-change_dlm_lib.patch new file mode 100644 index 0000000..213ce4c --- /dev/null +++ b/bug-838705-change_dlm_lib.patch @@ -0,0 +1,78 @@ +Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/fsck.ocfs2/Makefile +=================================================================== +--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/fsck.ocfs2/Makefile ++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/fsck.ocfs2/Makefile +@@ -12,7 +12,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo + LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a + LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) + LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a +-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm ++LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm_lt + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal + LIBTOOLS_INTERNAL_DEPS = $(TOPDIR)/libtools-internal/libtools-internal.a +Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mkfs.ocfs2/Makefile +=================================================================== +--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mkfs.ocfs2/Makefile ++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mkfs.ocfs2/Makefile +@@ -8,7 +8,7 @@ SBIN_PROGRAMS = mkfs.ocfs2 + LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 + LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a + +-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm ++LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm_lt + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + + LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) +Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mount.ocfs2/Makefile +=================================================================== +--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mount.ocfs2/Makefile ++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mount.ocfs2/Makefile +@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo + LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a + LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) + LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a +-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap ++LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + + DEFINES = -DVERSION=\"$(VERSION)\" +Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mounted.ocfs2/Makefile +=================================================================== +--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mounted.ocfs2/Makefile ++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mounted.ocfs2/Makefile +@@ -8,7 +8,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/liboc + LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) + LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a + +-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap ++LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + + LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal +Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_hb_ctl/Makefile +=================================================================== +--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/ocfs2_hb_ctl/Makefile ++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_hb_ctl/Makefile +@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo + LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a + LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) + LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a +-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap ++LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + + ifndef OCFS2_DYNAMIC_CTL +Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/tunefs.ocfs2/Makefile +=================================================================== +--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/tunefs.ocfs2/Makefile ++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/tunefs.ocfs2/Makefile +@@ -11,7 +11,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/liboc + LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) + LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a + +-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap ++LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + + UNINST_LIBRARIES = libocfs2ne.a diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 3051606..c38a787 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 12 09:30:27 UTC 2013 - lzhong@suse.com + +- mkfs.ocfs2/tunefs.ocfs2 may hang there because of dlm_unlock + +bug-838705-change_dlm_lib.patch + ------------------------------------------------------------------- Thu Sep 5 07:24:42 CDT 2013 - rgoldwyn@suse.com diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 2f66d2c..f86a797 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -55,6 +55,7 @@ Patch226: 0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch Patch227: 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch Patch228: 0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch Patch229: 0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch +Patch230: bug-838705-change_dlm_lib.patch BuildRequires: autoconf BuildRequires: e2fsprogs-devel @@ -161,6 +162,7 @@ managing the file system. %patch227 -p1 %patch228 -p1 %patch229 -p1 +%patch230 -p1 %build export PROJECT="ocfs2-tools"