From 59fcbf49ca571d126866731948c14a9645ad88e943f78c335d870506b2df35c3 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 8 Feb 2010 04:34:06 +0000 Subject: [PATCH] Remove some obsolete files. OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=11 --- ARM_libdmraid_ldflags.diff | 21 ---- dm_dso_reg_tool-1.0.0.rc2.tgz | 3 - dmraid-1.0.0.rc14-fixup_lsi1068e.patch | 59 ----------- dmraid_fixup_paths3.diff | 132 ------------------------- 4 files changed, 215 deletions(-) delete mode 100644 ARM_libdmraid_ldflags.diff delete mode 100644 dm_dso_reg_tool-1.0.0.rc2.tgz delete mode 100644 dmraid-1.0.0.rc14-fixup_lsi1068e.patch delete mode 100644 dmraid_fixup_paths3.diff diff --git a/ARM_libdmraid_ldflags.diff b/ARM_libdmraid_ldflags.diff deleted file mode 100644 index 3de454c..0000000 --- a/ARM_libdmraid_ldflags.diff +++ /dev/null @@ -1,21 +0,0 @@ -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/dm_dso_reg_tool-1.0.0.rc2.tgz b/dm_dso_reg_tool-1.0.0.rc2.tgz deleted file mode 100644 index a48ea21..0000000 --- a/dm_dso_reg_tool-1.0.0.rc2.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7281f5be8b419fbfd83405207a8d6721d2ae44a01749c0eb8b67823127d17ca9 -size 12424 diff --git a/dmraid-1.0.0.rc14-fixup_lsi1068e.patch b/dmraid-1.0.0.rc14-fixup_lsi1068e.patch deleted file mode 100644 index 85147f4..0000000 --- a/dmraid-1.0.0.rc14-fixup_lsi1068e.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: 1.0.0.rc15/lib/format/ddf/ddf1.c -=================================================================== ---- 1.0.0.rc15.orig/lib/format/ddf/ddf1.c 2008-06-20 18:04:10.000000000 +0200 -+++ 1.0.0.rc15/lib/format/ddf/ddf1.c 2008-09-24 16:10:34.000000000 +0200 -@@ -40,6 +40,9 @@ static const char *handler = HANDLER; - // #define PCI_VENDOR_ID_ADAPTEC 0x9004 - #define PCI_VENDOR_ID_ADAPTEC2 0x9005 - -+/* PCI IDs for LSI */ -+#define PCI_VENDOR_ID_LSI 0x1000 -+ - /* Map DDF1 disk status to dmraid status */ - static enum status - disk_status(struct ddf1_phys_drive *disk) -@@ -378,6 +381,13 @@ read_extended(struct lib_context *lc, st - ddf1->adaptec_mode = 1; - } - -+ if (ddf1->adapter && -+ ddf1->adapter->pci_vendor == PCI_VENDOR_ID_LSI) { -+ log_notice(lc, "%s: LSI mode discovered on %s", -+ handler, di->path); -+ ddf1->lsi_mode = 1; -+ } -+ - /* Read physical drive characteristic data */ - where = to_bytes(pri->primary_table_lba + pri->disk_data_offset); - if (!(ddata = ddf1->disk_data = -@@ -692,10 +702,14 @@ name(struct lib_context *lc, struct ddf1 - } else { - char *b; - -- for (b = buf + prefix, i = 0; i < 24; b += 8, i += 4) -- sprintf(b, "%02x%02x%02x%02x", -- vd->guid[i], vd->guid[i + 1], -- vd->guid[i + 2], vd->guid[i + 3]); -+ for (b = buf + prefix, i = 0; i < 24; b += 8, i += 4) { -+ if (i == 16 && ddf1->lsi_mode) -+ sprintf(b, "00000000"); -+ else -+ sprintf(b, "%02x%02x%02x%02x", -+ vd->guid[i], vd->guid[i+1], -+ vd->guid[i+2], vd->guid[i+3]); -+ } - } - - out: -Index: 1.0.0.rc15/lib/format/ddf/ddf1.h -=================================================================== ---- 1.0.0.rc15.orig/lib/format/ddf/ddf1.h 2008-06-12 12:54:32.000000000 +0200 -+++ 1.0.0.rc15/lib/format/ddf/ddf1.h 2008-09-24 16:03:52.000000000 +0200 -@@ -264,6 +264,7 @@ struct ddf1 { - int disk_format; - int in_cpu_format; - int adaptec_mode; -+ int lsi_mode; - }; - - #endif /* FORMAT_HANDLER */ diff --git a/dmraid_fixup_paths3.diff b/dmraid_fixup_paths3.diff deleted file mode 100644 index 8f0f51f..0000000 --- a/dmraid_fixup_paths3.diff +++ /dev/null @@ -1,132 +0,0 @@ -diff -pur dmraid/1.0.0.rc10.orig/include/Makefile.in dmraid/1.0.0.rc10/include/Makefile.in ---- dmraid/1.0.0.rc10.orig/include/Makefile.in 2006-02-17 17:19:25.000000000 +0100 -+++ dmraid/1.0.0.rc10/include/Makefile.in 2006-08-08 16:36:21.000000000 +0200 -@@ -17,14 +17,14 @@ include $(top_srcdir)/make.tmpl - - install_dmraid_headers: $(HEADERS) - @echo "Installing $(HEADERS) in $(includedir)/dmraid" -- mkdir -p $(includedir)/dmraid -- $(INSTALL) $(STRIP) $(HEADERS) $(includedir)/dmraid -+ mkdir -p $(DESTDIR)$(includedir)/dmraid -+ $(INSTALL) $(STRIP) $(HEADERS) $(DESTDIR)$(includedir)/dmraid - - install: install_dmraid_headers - - remove_dmraid_headers: - @echo "Removing $(HEADERS) from $(includedir)/dmraid" -- rm -f $(includedir)/dmraid -+ rm -f $(DESTDIR)$(includedir)/dmraid - - remove: remove_dmraid_headers - -Nur in dmraid/1.0.0.rc10/lib/activate: activate.c~. -diff -pur dmraid/1.0.0.rc10.orig/lib/Makefile.in dmraid/1.0.0.rc10/lib/Makefile.in ---- dmraid/1.0.0.rc10.orig/lib/Makefile.in 2006-02-17 17:19:25.000000000 +0100 -+++ dmraid/1.0.0.rc10/lib/Makefile.in 2006-08-09 10:56:06.000000000 +0200 -@@ -62,16 +62,16 @@ include $(top_srcdir)/make.tmpl - - install_dmraid_libs: $(INSTALL_TARGETS) - @echo "Installing $(INSTALL_TARGETS) in $(libdir)"; \ -- mkdir -p $(libdir); \ -+ mkdir -p $(DESTDIR)$(libdir); \ - for f in $(INSTALL_TARGETS); \ - do \ - n=$$(basename $${f}) ; \ - if [[ "$$n" =~ '.so$$' ]]; then \ - $(INSTALL) -m 555 $(STRIP) \ -- $$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \ -- $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n}; \ -+ $$f $(DESTDIR)$(libdir)/$${n}.@DMRAID_LIB_VERSION@; \ -+ $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(DESTDIR)$(libdir)/$${n}; \ - else \ -- $(INSTALL) -m 555 $(STRIP) $$f $(libdir)/$${n}; \ -+ $(INSTALL) -m 555 $(STRIP) $$f $(DESTDIR)$(libdir)/$${n}; \ - fi \ - done - -@@ -82,8 +82,8 @@ remove_dmraid_libs: - for f in $(INSTALL_TARGETS); \ - do \ - n=$$(basename $${f}) ; \ -- rm -f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \ -- rm -f $(libdir)/$${n}; \ -+ rm -f $(DESTDIR)$(libdir)/$${n}.@DMRAID_LIB_VERSION@; \ -+ rm -f $(DESTDIR)$(libdir)/$${n}; \ - done - - remove: remove_dmraid_libs -Nur in dmraid/1.0.0.rc10/lib: Makefile.in~. -diff -pur dmraid/1.0.0.rc10.orig/make.tmpl.in dmraid/1.0.0.rc10/make.tmpl.in ---- dmraid/1.0.0.rc10.orig/make.tmpl.in 2006-02-17 17:18:27.000000000 +0100 -+++ dmraid/1.0.0.rc10/make.tmpl.in 2006-08-08 16:35:32.000000000 +0200 -@@ -21,8 +21,8 @@ LD_DEPS += @LD_DEPS@ - SOFLAG += @SOFLAG@ - - # Setup directory variables --prefix = $(DESTDIR)@prefix@ --exec_prefix = $(DESTDIR)@exec_prefix@ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ - bindir = @bindir@ - ifeq ("@KLIBC@", "no") - libdir = @libdir@ -@@ -31,9 +31,9 @@ ifeq ("@KLIBC@", "no") - infodir = @infodir@ - mandir = @mandir@ - else -- libdir = $(DESTDIR)@KLIBC_LIB_DIR@ -- sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@ -- includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@ -+ libdir = @KLIBC_LIB_DIR@ -+ sbindir = @KLIBC_SBIN_DIR@ -+ includedir = @KLIBC_INCLUDE_DIR@ - infodir = @infodir@ - mandir = @mandir@ - endif -diff -pur dmraid/1.0.0.rc10.orig/man/Makefile.in dmraid/1.0.0.rc10/man/Makefile.in ---- dmraid/1.0.0.rc10.orig/man/Makefile.in 2006-02-17 17:19:25.000000000 +0100 -+++ dmraid/1.0.0.rc10/man/Makefile.in 2006-08-08 16:35:32.000000000 +0200 -@@ -20,8 +20,8 @@ install_dmraid_man: - mkdir -p $(MAN8DIR); \ - for f in $(MAN8); \ - do \ -- $(RM) $(MAN8DIR)/$$f; \ -- @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \ -+ $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \ -+ @INSTALL@ -D -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \ - done - - install: install_dmraid_man -@@ -30,7 +30,7 @@ remove_dmraid_man: - @echo "Removing $(MAN8) in $(MAN8DIR)"; \ - for f in $(MAN8); \ - do \ -- $(RM) $(MAN8DIR)/$$f; \ -+ $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \ - done - - remove: remove_dmraid_man -diff -pur dmraid/1.0.0.rc10.orig/tools/Makefile.in dmraid/1.0.0.rc10/tools/Makefile.in ---- dmraid/1.0.0.rc10.orig/tools/Makefile.in 2006-02-17 21:16:32.000000000 +0100 -+++ dmraid/1.0.0.rc10/tools/Makefile.in 2006-08-09 11:08:10.000000000 +0200 -@@ -60,8 +60,8 @@ dmraid: $(OBJECTS) $(top_srcdir)/lib/lib - - install_dmraid_tools: $(TARGETS) - @echo "Installing $(TARGETS) in $(sbindir)"; \ -- mkdir -p $(sbindir); \ -- $(INSTALL) $(STRIP) $(TARGETS) $(sbindir) -+ mkdir -p $(DESTDIR)$(sbindir); \ -+ $(INSTALL) $(STRIP) $(TARGETS) $(DESTDIR)$(sbindir) - - install: install_dmraid_tools - -@@ -69,7 +69,7 @@ remove_dmraid_tools: - @echo "Removing $(TARGETS) from $(sbindir)"; \ - for f in $(TARGETS); \ - do \ -- rm -f $(sbindir)/$$f; \ -+ rm -f $(DESTDIR)$(sbindir)/$$f; \ - done - - remove: remove_dmraid_tools -Nur in dmraid/1.0.0.rc10/tools: Makefile.in~.