pool/dmraid
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dmraid?expand=0&rev=1

Browse Source
This commit is contained in:
OBS User unknown 2007-01-15 23:10:18 +00:00 committed by Git OBS Bridge
commit fdf5000b9a
13 changed files with 658 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

15
dmraid-1.0.0.rc13-fix_macro.patch Normal file
View File

@ -0,0 +1,15 @@
Index: 1.0.0.rc13/lib/internal.h
===================================================================
--- 1.0.0.rc13.orig/lib/internal.h
+++ 1.0.0.rc13/lib/internal.h
@@ -49,8 +49,8 @@
#define u_int64_t uint64_t
#endif
-#define min(a, b) a < b ? a : b
-#define max(a, b) a > b ? a : b
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#define max(a, b) ((a) > (b) ? (a) : (b))
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*a))
#define ARRAY_END(a) (a + ARRAY_SIZE(a))

107
dmraid-1.0.0.rc13-geometry.patch Normal file
View File

@ -0,0 +1,107 @@
Index: 1.0.0.rc13/lib/activate/devmapper.c
===================================================================
--- 1.0.0.rc13.orig/lib/activate/devmapper.c
+++ 1.0.0.rc13/lib/activate/devmapper.c
@@ -164,6 +164,7 @@ static int run_task(struct lib_context *
_init_dm();
ret = (dmt = dm_task_create(type)) && dm_task_set_name(dmt, rs->name) &&
dm_task_set_uuid(dmt, uuid);
+
if (ret && table)
ret = parse_table(lc, dmt, table);
@@ -174,6 +175,83 @@ static int run_task(struct lib_context *
free(uuid);
return ret;
}
+
+int get_edd_value(unsigned long *value, const char *path)
+{
+ FILE *file;
+ unsigned long v;
+
+ file = fopen(path, "r");
+ if (file == NULL)
+ return 0;
+
+ if (fscanf(file, "%lu", &v) == 0) {
+ fclose(file);
+ return 0;
+ }
+ fclose(file);
+
+ *value = v;
+ return 1;
+}
+
+#define EDD_PREFIX "/sys/firmware/edd/int13_dev80/"
+
+int getgeo_edd(unsigned long *cylinders,
+ unsigned long *heads,
+ unsigned long *sectors)
+{
+ int res;
+ unsigned long c, h, s;
+
+ res = get_edd_value(&c, EDD_PREFIX "legacy_max_cylinder") &&
+ get_edd_value(&h, EDD_PREFIX "legacy_max_head") &&
+ get_edd_value(&s, EDD_PREFIX "legacy_sectors_per_track");
+
+ if (!res)
+ return 0;
+
+ *cylinders = c;
+ *heads = h;
+ *sectors = s;
+
+ return 1;
+}
+
+/* Set the geometry of the device */
+int set_geometry(struct lib_context *lc, struct raid_set *rs)
+{
+ int ret;
+ struct dm_task *dmt;
+ unsigned long c, h, sec, st;
+ char cyl[10], heads[10], sectors[10], start[10];
+
+ st = 0;
+ if (!getgeo_edd(&c, &h, &sec)) {
+ /* default */
+ c = 16383;
+ h = 16;
+ sec = 63;
+ }
+
+ snprintf(cyl, 10, "%lu", c);
+ snprintf(heads, 10, "%lu", h);
+ snprintf(sectors, 10, "%lu", sec);
+ snprintf(start, 10, "%lu", st);
+
+ _init_dm();
+ ret = (dmt = dm_task_create(DM_DEVICE_SET_GEOMETRY)) &&
+ dm_task_set_name(dmt, rs->name) &&
+ dm_task_set_geometry(dmt, cyl, heads, sectors, start);
+
+ if (ret)
+ ret = dm_task_run(dmt);
+
+ _exit_dm(dmt);
+
+ return ret;
+}
+
/* Create a mapped device. */
int dm_create(struct lib_context *lc, struct raid_set *rs, char *table)
{
@@ -182,6 +260,10 @@ int dm_create(struct lib_context *lc, st
/* Create <dev_name> */
ret = run_task(lc, rs, table, DM_DEVICE_CREATE);
+ /* Set geometry */
+ if (ret)
+ set_geometry(lc, rs);
+
/*
* In case device creation failed, check if target
* isn't registered with the device-mapper core

23
dmraid-1.0.0.rc13-jm_termination.patch Normal file
View File

@ -0,0 +1,23 @@
Index: 1.0.0.rc13/lib/format/ataraid/jm.c
===================================================================
--- 1.0.0.rc13.orig/lib/format/ataraid/jm.c
+++ 1.0.0.rc13/lib/format/ataraid/jm.c
@@ -28,10 +28,15 @@ static char *name(struct lib_context *lc
size_t len;
struct jm *jm = META(rd, jm);
char buf[2], *ret, *name = (char *) jm->name;
+ char buf0[JM_NAME_LEN+1] = { '\0' };
+ size_t i = JM_NAME_LEN-1;
- /* Name always 0 terminated ? */
- if ((len = strlen(name)) > JM_NAME_LEN)
- len = JM_NAME_LEN;
+ strncpy(buf0, jm->name, JM_NAME_LEN);
+ while (i!=0 && buf0[i]==' ') {
+ buf0[i]='\0';
+ --i;
+ }
+ len = strlen(buf0);
len += sizeof(HANDLER) + 2;
if (jm->mode == JM_T_RAID01)

3
dmraid-1.0.0.rc13.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8497196528d50203053de0f733917b1d85aae416d2136c695a07aee5632b12b9
size 170497

45
dmraid-add_uuid.patch Normal file
View File

@ -0,0 +1,45 @@
Index: 1.0.0.rc13/lib/activate/devmapper.c
===================================================================
--- 1.0.0.rc13.orig/lib/activate/devmapper.c
+++ 1.0.0.rc13/lib/activate/devmapper.c
@@ -153,9 +153,17 @@ static int run_task(struct lib_context *
{
int ret;
struct dm_task *dmt;
+ char *uuid;
+
+ /* Generate UUID */
+ uuid = malloc(strlen(rs->name) + UUID_PREFIX_LEN + 1);
+ if (!uuid) return 0;
+
+ sprintf(uuid, UUID_PREFIX "%s", rs->name);
_init_dm();
- ret = (dmt = dm_task_create(type)) && dm_task_set_name(dmt, rs->name);
+ ret = (dmt = dm_task_create(type)) && dm_task_set_name(dmt, rs->name) &&
+ dm_task_set_uuid(dmt, uuid);
if (ret && table)
ret = parse_table(lc, dmt, table);
@@ -163,6 +171,7 @@ static int run_task(struct lib_context *
ret = dm_task_run(dmt);
_exit_dm(dmt);
+ free(uuid);
return ret;
}
/* Create a mapped device. */
Index: 1.0.0.rc13/lib/activate/devmapper.h
===================================================================
--- 1.0.0.rc13.orig/lib/activate/devmapper.h
+++ 1.0.0.rc13/lib/activate/devmapper.h
@@ -8,6 +8,9 @@
#ifndef _DEVMAPPER_H_
#define _DEVMAPPER_H
+#define UUID_PREFIX "dmraid-"
+#define UUID_PREFIX_LEN 7
+
char *mkdm_path(struct lib_context *lc, const char *name);
int dm_create(struct lib_context *lc, struct raid_set *rs, char *table);
int dm_remove(struct lib_context *lc, struct raid_set *rs);

63
dmraid.changes Normal file
View File

@ -0,0 +1,63 @@
-------------------------------------------------------------------
Mon Dec 11 10:48:21 CET 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 16:51:32 CET 2006 - mkoenig@suse.de
- fix geometry patch [#222110]
-------------------------------------------------------------------
Mon Nov 20 18:53:55 CET 2006 - mkoenig@suse.de
- set geometry of dm device [#222110]
-------------------------------------------------------------------
Thu Nov 9 14:25:36 CET 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
-------------------------------------------------------------------
Thu Sep 14 00:17:11 CEST 2006 - ro@suse.de
- use device-mapper-devel in BuildRequires
-------------------------------------------------------------------
Tue Aug 29 10:09:10 CEST 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 21:35:31 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Mon Dec 5 10:10:35 CET 2005 - kukuk@suse.de
- Remove unused klibc-devel from neededforbuild
-------------------------------------------------------------------
Wed Jul 13 16:25:07 CEST 2005 - cadaha@suse.de
- update to 1.0.0-rc8, fix big endian build
-------------------------------------------------------------------
Wed Sep 22 01:14:20 CEST 2004 - cadaha@suse.de
- fix dmraid -rc output for unsupported devices
-------------------------------------------------------------------
Mon Sep 20 19:21:34 CEST 2004 - cadaha@suse.de
- created package

131
dmraid.spec Normal file
View File

@ -0,0 +1,131 @@
#
# spec file for package dmraid (Version 1.0.0.rc13)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: dmraid
BuildRequires: device-mapper-devel
URL: http://people.redhat.com/~heinzm/sw/dmraid/src/
License: GNU General Public License (GPL)
Group: System/Base
Autoreqprov: on
Summary: A Device-Mapper Software RAID Support Tool
Version: 1.0.0.rc13
Release: 10
Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2
Patch0: dmraid_fixup_paths3.diff
Patch1: dmraid-add_uuid.patch
Patch2: dmraid_fixup_nvidia.diff
Patch3: dmraid_duplicate_args.patch
Patch4: dmraid-1.0.0.rc13-geometry.patch
Patch5: dmraid-1.0.0.rc13-jm_termination.patch
Patch6: dmraid-1.0.0.rc13-fix_macro.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This software discovers, activates, deactivates, and displays
properties of software RAID sets, such as ATARAID, and contained DOS
partitions.
dmraid uses libdevmapper and the device-mapper kernel runtime to create
devices with respective mappings for the ATARAID sets discovered.
The following ATARAID types are supported:
- Highpoint HPT37X
- Highpoint HPT45X
- Intel Software RAID
- Promise FastTrak
- Silicon Image Medley
Authors:
--------
Heinz Mauelshagen
%prep
%setup -n dmraid/%{version}
%patch0 -p2
%patch1 -p1
%patch2 -p2
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
#rm -f aclocal.m4
autoreconf -fi
rm -r autom4te.cache
# Update config.{guess,sub}
%{?suse_update_config}
export CFLAGS="$RPM_OPT_FLAGS"
./configure --prefix=%{_prefix} \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
--sbindir=/sbin \
--with-user=`id -nu` --with-group=`id -ng`
make
%install
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \
&& rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/usr/include/dmraid
rm $RPM_BUILD_ROOT%{_libdir}/libdmraid.a
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \
&& rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
#%{_libdir}/libdmraid.so
/sbin/dmraid
%{_mandir}/man8/*
%doc LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/*
%changelog -n dmraid
* 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
* Thu Sep 14 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

29
dmraid_duplicate_args.patch Normal file
View File

@ -0,0 +1,29 @@
Nur in 1.0.0.rc11/lib/misc: lib_context.c~.
Nur in 1.0.0.rc11: TAGS.
diff -pur 1.0.0.rc11.orig/tools/commands.c 1.0.0.rc11/tools/commands.c
--- 1.0.0.rc11.orig/tools/commands.c 2006-03-21 10:49:28.000000000 +0100
+++ 1.0.0.rc11/tools/commands.c 2006-08-29 10:06:00.000000000 +0200
@@ -127,10 +127,18 @@ static int check_identifiers(struct lib_
const char delim = *OPT_STR_SEPARATOR(lc);
char *p = optarg;
- p = remove_white_space(lc, p, strlen(p));
- p = collapse_delimiter(lc, p, strlen(p), delim);
- if (!lc_strcat_opt(lc, o, p, delim))
- return 0;
+ if (o == LC_COLUMN) {
+ while (p && *p == 'c') {
+ lc_inc_opt(lc, o);
+ p++;
+ }
+ }
+ if (p && *p) {
+ p = remove_white_space(lc, p, strlen(p));
+ p = collapse_delimiter(lc, p, strlen(p), delim);
+ if (!lc_strcat_opt(lc, o, p, delim))
+ return 0;
+ }
}
lc_inc_opt(lc, o);
Nur in 1.0.0.rc11/tools: commands.c~.

86
dmraid_fixup_nvidia.diff Normal file
View File

@ -0,0 +1,86 @@
diff -pur dmraid/1.0.0.rc11.orig/lib/datastruct/byteorder.h dmraid/1.0.0.rc11/lib/datastruct/byteorder.h
--- dmraid/1.0.0.rc11.orig/lib/datastruct/byteorder.h 2006-05-12 14:57:41.000000000 +0200
+++ dmraid/1.0.0.rc11/lib/datastruct/byteorder.h 2006-08-10 16:12:05.000000000 +0200
@@ -18,28 +18,28 @@
static inline uint64_t le64_to_cpu(uint64_t x)
{
- return((((uint64_t)x & 0x00000000000000ffULL) << 56) |
- (((uint64_t)x & 0x000000000000ff00ULL) << 40) |
- (((uint64_t)x & 0x0000000000ff0000ULL) << 24) |
- (((uint64_t)x & 0x00000000ff000000ULL) << 8) |
- (((uint64_t)x & 0x000000ff00000000ULL) >> 8) |
- (((uint64_t)x & 0x0000ff0000000000ULL) >> 24) |
- (((uint64_t)x & 0x00ff000000000000ULL) >> 40) |
- (((uint64_t)x & 0xff00000000000000ULL) >> 56));
+ return((((uint64_t)(x) & 0x00000000000000ffULL) << 56) |
+ (((uint64_t)(x) & 0x000000000000ff00ULL) << 40) |
+ (((uint64_t)(x) & 0x0000000000ff0000ULL) << 24) |
+ (((uint64_t)(x) & 0x00000000ff000000ULL) << 8) |
+ (((uint64_t)(x) & 0x000000ff00000000ULL) >> 8) |
+ (((uint64_t)(x) & 0x0000ff0000000000ULL) >> 24) |
+ (((uint64_t)(x) & 0x00ff000000000000ULL) >> 40) |
+ (((uint64_t)(x) & 0xff00000000000000ULL) >> 56));
}
static inline int32_t le32_to_cpu(int32_t x)
{
- return((((u_int32_t)x & 0x000000ffU) << 24) |
- (((u_int32_t)x & 0x0000ff00U) << 8) |
- (((u_int32_t)x & 0x00ff0000U) >> 8) |
- (((u_int32_t)x & 0xff000000U) >> 24));
+ return((((u_int32_t)(x) & 0x000000ffU) << 24) |
+ (((u_int32_t)(x) & 0x0000ff00U) << 8) |
+ (((u_int32_t)(x) & 0x00ff0000U) >> 8) |
+ (((u_int32_t)(x) & 0xff000000U) >> 24));
}
static inline int16_t le16_to_cpu(int16_t x)
{
- return((((u_int16_t)x & 0x00ff) << 8) |
- (((u_int16_t)x & 0xff00) >> 8));
+ return((((u_int16_t)(x) & 0x00ff) << 8) |
+ (((u_int16_t)(x) & 0xff00) >> 8));
}
#define CVT64(x) do { x = le64_to_cpu(x); } while(0)
Nur in dmraid/1.0.0.rc11/lib/datastruct: byteorder.h~.
diff -pur dmraid/1.0.0.rc11.orig/lib/format/ataraid/nv.c dmraid/1.0.0.rc11/lib/format/ataraid/nv.c
--- dmraid/1.0.0.rc11.orig/lib/format/ataraid/nv.c 2006-03-23 13:33:00.000000000 +0100
+++ dmraid/1.0.0.rc11/lib/format/ataraid/nv.c 2006-08-10 16:20:07.000000000 +0200
@@ -151,7 +151,7 @@ static int set_sort(struct list_head *po
static void to_cpu(void *meta)
{
struct nv *nv = meta;
- unsigned int i = NV_SIGNATURES;
+ unsigned int i;
struct nv_array_base *array = &nv->array;
CVT32(nv->size);
@@ -162,7 +162,7 @@ static void to_cpu(void *meta)
CVT32(nv->unitFlags);
CVT32(array->version);
- while (i--);
+ for (i = 0; i < NV_SIGNATURES; i++);
CVT32(array->signature[i]);
CVT32(array->raidLevel);
@@ -221,15 +221,9 @@ static struct raid_dev *nv_read(struct l
static int nv_write(struct lib_context *lc, struct raid_dev *rd, int erase)
{
int ret;
-#if BYTE_ORDER != LITTLE_ENDIAN
- struct nv *nv = META(rd, nv);
- to_disk(nv);
-#endif
ret = write_metadata(lc, handler, rd, -1, erase);
-#if BYTE_ORDER != LITTLE_ENDIAN
- to_cpu(nv);
-#endif
+
return ret;
}
Nur in dmraid/1.0.0.rc11/lib/format/ataraid: nv.c~.

132
dmraid_fixup_paths3.diff Normal file
View File

@ -0,0 +1,132 @@
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~.

0
ready Normal file
View File