diff --git a/dmraid.changes b/dmraid.changes index 2c7fc64..18406ef 100644 --- a/dmraid.changes +++ b/dmraid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 13 09:33:56 UTC 2015 - lwang@suse.com + +- dmevent_tool fails with "undefined symbol" (bnc#935623) + Added: fix-undefined-symbol.patch + ------------------------------------------------------------------- Wed Feb 4 19:33:01 UTC 2015 - coolo@suse.com diff --git a/dmraid.spec b/dmraid.spec index 20de4cd..e9e061e 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -1,7 +1,7 @@ # # spec file for package dmraid # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,6 +46,8 @@ Patch6: rebuild.fix Patch7: ddf-erase Patch8: dmraid-move-var-lock-to-run-lock.patch Patch9: dmraid-destdir.patch +Patch10: fix-undefined-symbol.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %{systemd_requires} @@ -94,6 +96,8 @@ devices with respective mappings for the ATARAID sets discovered. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 + cp %{SOURCE3} . %build diff --git a/fix-undefined-symbol.patch b/fix-undefined-symbol.patch new file mode 100644 index 0000000..0750b37 --- /dev/null +++ b/fix-undefined-symbol.patch @@ -0,0 +1,28 @@ +From 352b509c8f452a0d77d8adb9149130d5af624b32 Mon Sep 17 00:00:00 2001 +From: Liuhua Wang +Date: Thu, 9 Jul 2015 10:22:46 +0800 +Subject: [PATCH] fix undefined symbol + +Signed-off-by: Liuhua Wang +References: bnc#935623 + +--- + dmraid/1.0.0.rc16/tools/dmevent_tool.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git 1.0.0.rc16.orig/tools/dmevent_tool.c 1.0.0.rc16/tools/dmevent_tool.c +index 8562098..4c43b30 100644 +--- 1.0.0.rc16.orig/tools/dmevent_tool.c ++++ 1.0.0.rc16/tools/dmevent_tool.c +@@ -77,6 +77,8 @@ + #define SYS_DM_DEV "/dev" + #define SYS_DM_SLAVES_DIR "/slaves" + ++int dmeventd_debug = 0; ++ + /* Command line option counters for CLI processing. */ + enum option_type { OPT_a, OPT_h, OPT_m, OPT_r, OPT_u, OPT_V, OPT_SUM, OPT_MAX }; + static int optc[OPT_MAX]; +-- +1.8.4.5 +