diff --git a/ARM_libdmraid_ldflags.diff b/ARM_libdmraid_ldflags.diff new file mode 100644 index 0000000..3de454c --- /dev/null +++ b/ARM_libdmraid_ldflags.diff @@ -0,0 +1,21 @@ +diff -Napur _libdmraid-events//Makefile libdmraid-events/Makefile +--- _libdmraid-events//Makefile 2009-07-30 00:27:43.000000000 +0200 ++++ libdmraid-events/Makefile 2009-07-30 00:27:58.000000000 +0200 +@@ -27,7 +27,7 @@ + ########################################################################## + + CC=gcc +-LDFLAGS +=-ldevmapper -ldevmapper-event ++LDFLAGS +=-L../lib -ldevmapper -ldevmapper-event + INSTALL =/usr/bin/install -c + LIB_DIR=/usr/lib + LD_CFG=/sbin/ldconfig +@@ -39,7 +39,7 @@ GROUP =-g root + + + libdmraid-events: +- $(CC) $@.c -ldmraid -lm -g -fPIC -Wall -shared -Wl,-soname,$@.$(LIB_SUFFIX).$(LIB_VERSION) -o $@.$(LIB_SUFFIX).$(LIB_VERSION) ++ $(CC) $@.c -L../lib -ldmraid -lm -g -fPIC -Wall -shared -Wl,-soname,$@.$(LIB_SUFFIX).$(LIB_VERSION) -o $@.$(LIB_SUFFIX).$(LIB_VERSION) + + install: + $(INSTALL) -D $(OWNER) $(GROUP) -m 755 libdmraid-events.$(LIB_SUFFIX).$(LIB_VERSION) \ diff --git a/dmraid.changes b/dmraid.changes index 508d345..15d20ea 100644 --- a/dmraid.changes +++ b/dmraid.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 2 18:50:22 UTC 2009 - jansimon.moeller@opensuse.org + +- The cmdline options don't work when compiling the events module + on ARM. Add patch to directly include the ldflags in the + Makefile. + ------------------------------------------------------------------- Mon Nov 24 09:43:13 CET 2008 - hare@suse.de diff --git a/dmraid.spec b/dmraid.spec index 074d6cd..db7f2bc 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -1,7 +1,7 @@ # # spec file for package dmraid (Version 1.0.0.rc15) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -28,7 +28,7 @@ Group: System/Base AutoReqProv: on Summary: A Device-Mapper Software RAID Support Tool Version: 1.0.0.rc15 -Release: 4 +Release: 6 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid Source2: boot.dmraid @@ -43,6 +43,7 @@ Patch4: dmraid-1.0.0.rc13-geometry.patch Patch6: dmraid-1.0.0.rc15-fix_macro.patch Patch10: dmraid-1.0.0.rc14-fixup_lsi1068e.patch Patch11: dmraid-1.0.0.rc15-scsi_serial_remove_ws.patch +Patch500: ARM_libdmraid_ldflags.diff # libdmraid-events Patch50: libdmraid-events.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -115,6 +116,7 @@ Authors: %patch11 -p1 pushd libdmraid* %patch50 +%patch500 -p1 popd cp %{SOURCE3} . @@ -196,95 +198,3 @@ install -D -m644 reg_tool/dm_dso_reg_tool.8 $RPM_BUILD_ROOT/usr/share/man/man8/d /%{_lib}/libdmraid-events.so.0 %changelog -* Mon Nov 24 2008 hare@suse.de -- Properly quote mkinitrd scripts (bnc#447966) -* Mon Nov 10 2008 mkoenig@suse.de -- adapt mkinitrd script to changed UUID prefix [bnc#441479] -* Tue Oct 14 2008 mkoenig@suse.de -- remove whitespace from serial id [bnc#433833] -* Thu Sep 25 2008 mkoenig@suse.de -- update to 1.0.0rc15 - * jm.c: fixed name handling - * nv.c: fixed endian bug - * added support for RAID set create/remove/rebuild and - event handling -- needed for [fate#304215,fate#303950,fate#304216] -- removed patches - dmraid-1.0.0.rc13-jm_termination.patch - dmraid-1.0.0.rc14-ddf1_segfault.patch - dmraid-add_uuid.patch - dmraid_fixup_nvidia.diff - dmraid-move-type-definition.diff - dmraid-pdc_max_sectors.patch -* Wed Sep 24 2008 ro@suse.de -- change "udevsettle" to "udevadm settle" -* Tue Sep 16 2008 mkoenig@suse.de -- ignore the timestamp for LSI 1068E DDF1 metadata [bnc#426615] -* Mon Sep 15 2008 ro@suse.de -- fix typo in libdmraid Makefile -- split off libdmraid-events0 package according to - shared library packaging policy -* Sat Sep 13 2008 meissner@suse.de -- symlink, not copy the .so to the .so.0 file -- removed self-provides, some other .spec file fixes -* Wed Sep 10 2008 xwhu@novell.com -- Adding DSO for event-handling [fate#304214] -* Wed Sep 03 2008 hare@suse.de -- Call mkinitrd_setup during %%post and %%postun (bnc#413709) -* Wed Aug 20 2008 mkoenig@suse.de -- enable SELinux support [fate#303662] -* Wed Aug 13 2008 mkoenig@suse.de -- fix init script tags -* Wed Jul 23 2008 hare@suse.de -- Include mkinitrd scriptlets. -* Wed Mar 12 2008 mkoenig@suse.de -- add hack to avoid segfault with DDF1 metadata and explicit - indication of the raid set [#367686] -* Wed Sep 12 2007 mkoenig@suse.de -- add quirk for maximum detected device size of some pdc card - [#215222] -* Tue Jul 31 2007 hare@suse.de -- dmraid requires kpartx. -* Mon Jul 30 2007 hare@suse.de -- Do not activate partitions from dmraid; udev handles it. -* Tue Jul 10 2007 mkoenig@suse.de -- update to version 1.0.0.rc14 - * bugfix release -* Tue Jun 19 2007 mkoenig@suse.de -- use boot.localfs to avoid expansion problem -* Tue Jun 19 2007 mkoenig@suse.de -- Add X-Start-Before: $local_fs dependency -* Thu Mar 29 2007 mkoenig@suse.de -- Add zlib-devel to BuildRequires -* Tue Feb 20 2007 mkoenig@suse.de -- provide boot script [#230708] -* Mon Dec 11 2006 mkoenig@suse.de -- fix jm name string termination problem [#223843] - patch: dmraid-1.0.0.rc13-jm_termination.patch -- fix min, max macros - patch: dmraid-1.0.0.rc13-fix_macro.patch -* Thu Nov 23 2006 mkoenig@suse.de -- fix geometry patch [#222110] -* Mon Nov 20 2006 mkoenig@suse.de -- set geometry of dm device [#222110] -* Thu Nov 09 2006 mkoenig@suse.de -- update to version 1.0.0.rc13 - * Fixes for Promise FastTrak and Silicon Image Medley ATARAID - * Support for SNIA DDF1 and JBOD -* Wed Sep 13 2006 ro@suse.de -- use device-mapper-devel in BuildRequires -* Tue Aug 29 2006 hare@suse.de -- update to 1.0.0-rc11 -- NVidia endianness fixes -- Add UUID to device-mapper tables -- Fixup '-cc' argument -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Dec 05 2005 kukuk@suse.de -- Remove unused klibc-devel from neededforbuild -* Wed Jul 13 2005 cadaha@suse.de -- update to 1.0.0-rc8, fix big endian build -* Wed Sep 22 2004 cadaha@suse.de -- fix dmraid -rc output for unsupported devices -* Mon Sep 20 2004 cadaha@suse.de -- created package