diff --git a/base/mdadm/64.patch b/base/mdadm/64.patch deleted file mode 100644 index b6a848d06..000000000 --- a/base/mdadm/64.patch +++ /dev/null @@ -1,51 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../mdadm/64.patch -# Copyright (C) 2008 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -when cross compiling against dietlibc: -sysfs.c: In function 'sysfs_read': -sysfs.c:81: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' - -but when compiled for i386: -sysfs.c: In function 'sysfs_read': -sysfs.c:81: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int' - ---- ./sysfs.c.orig 2008-03-11 00:17:59.000000000 +0000 -+++ ./sysfs.c 2008-03-11 00:28:05.000000000 +0000 -@@ -78,9 +78,9 @@ - struct stat stb; - if (fstat(fd, &stb)) return NULL; - if (major(stb.st_rdev)==9) -- sprintf(sra->name, "md%d", minor(stb.st_rdev)); -+ sprintf(sra->name, "md%d", (int) minor(stb.st_rdev)); - else - sprintf(sra->name, "md_d%d", -- minor(stb.st_rdev)>>MdpMinorShift); -+ (int) minor(stb.st_rdev)>>MdpMinorShift); - } else { - if (devnum >= 0) -@@ -232,10 +232,10 @@ - int n; - if (fstat(fd, &stb)) return 0; - if (major(stb.st_rdev) == 9) - sprintf(fname, "/sys/block/md%d/md/component_size", -- minor(stb.st_rdev)); -+ (int) minor(stb.st_rdev)); - else - sprintf(fname, "/sys/block/md_d%d/md/component_size", -- minor(stb.st_rdev)>>MdpMinorShift); -+ (int) minor(stb.st_rdev)>>MdpMinorShift); - fd = open(fname, O_RDONLY); - if (fd < 0) diff --git a/base/mdadm/gcc-4.1.patch b/base/mdadm/gcc-4.1.patch deleted file mode 100644 index ca7479d3b..000000000 --- a/base/mdadm/gcc-4.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../mdadm/gcc-4.1.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./Detail.c.orig 2007-06-14 15:12:07.000000000 -0400 -+++ ./Detail.c 2007-06-14 15:12:19.000000000 -0400 -@@ -59,7 +59,7 @@ - void *super = NULL; - int rv = test ? 4 : 1; - int avail_disks = 0; -- char *avail; -+ char *avail = NULL; - - if (fd < 0) { - fprintf(stderr, Name ": cannot open %s: %s\n", diff --git a/base/mdadm/mdadm.desc b/base/mdadm/mdadm.desc index d3b014b8e..9c8fe6a17 100644 --- a/base/mdadm/mdadm.desc +++ b/base/mdadm/mdadm.desc @@ -1,4 +1,3 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] @@ -29,8 +28,7 @@ [L] GPL [S] Stable -[V] 2.6.4 +[V] 2.6.7 [P] X -?---5---9 194.000 -[D] 1204826038 mdadm-2.6.4.tar.bz2 http://www.kernel.org/pub/linux/utils/raid/mdadm/ - +[D] 831723234 mdadm-2.6.7.tar.bz2 http://www.kernel.org/pub/linux/utils/raid/mdadm/