lvm2-diet.patch

   1 --- LVM2.2.02.45/lib/commands/toolcontext.c     2009-02-22 22:14:38.000000000 +0100
   2 +++ LVM2.2.02.45-diet/lib/commands/toolcontext.c        2009-03-18 12:18:23.000000000 +0100
   3 @@ -1006,10 +1006,10 @@
   4  #ifdef M_MMAP_MAX
   5         mallopt(M_MMAP_MAX, 0);
   6  #endif
   7 -
   8 +#ifdef __dietlibc__
   9         if (!setlocale(LC_ALL, ""))
  10                 log_very_verbose("setlocale failed");
  11 -
  12 +#endif
  13  #ifdef INTL_PACKAGE
  14         bindtextdomain(INTL_PACKAGE, LOCALEDIR);
  15  #endif
  16 --- LVM2.2.02.45/lib/locking/file_locking.c     2008-11-12 10:30:52.000000000 +0100
  17 +++ LVM2.2.02.45-diet/lib/locking/file_locking.c        2009-03-18 12:18:52.000000000 +0100
  18 @@ -30,6 +30,10 @@
  19  #include <fcntl.h>
  20  #include <signal.h>
  21
  22 +#ifdef __dietlibc__
  23 +typedef void (*sig_t) (int);
  24 +#endif
  25 +
  26  struct lock_list {
  27         struct dm_list list;
  28         int lf;
  29 --- LVM2.2.02.45/libdm/libdevmapper.h   2008-11-04 16:07:45.000000000 +0100
  30 +++ LVM2.2.02.45-diet/libdm/libdevmapper.h      2009-03-18 12:17:27.000000000 +0100
  31 @@ -160,6 +160,10 @@
  32  /*
  33   * Control read_ahead.
  34   */
  35 +#ifdef __dietlibc__
  36 +# define UINT32_MAX             (4294967295U)
  37 +#endif
  38 +
  39  #define DM_READ_AHEAD_AUTO UINT32_MAX  /* Use kernel default readahead */
  40  #define DM_READ_AHEAD_NONE 0           /* Disable readahead */
  41
  42 --- LVM2.2.02.45/lib/config/config.c    2008-11-03 23:14:27.000000000 +0100
  43 +++ LVM2.2.02.45-diet/lib/config/config.c       2009-03-18 12:22:31.000000000 +0100
  44 @@ -28,6 +28,10 @@
  45  #include <ctype.h>
  46  #include <assert.h>
  47
  48 +#ifdef __dietlibc__
  49 +typedef char* caddr_t __attribute_dontuse__;
  50 +#endif
  51 +
  52  struct config_file {
  53         time_t timestamp;
  54         off_t st_size;
  55 --- LVM2.2.02.45/lib/misc/lib.h 2008-11-03 19:59:58.000000000 +0100
  56 +++ LVM2.2.02.45-diet/lib/misc/lib.h    2009-03-18 12:24:30.000000000 +0100
  57 @@ -45,4 +45,20 @@
  58  #include <unistd.h>
  59  #include <sys/stat.h>
  60
  61 +#ifdef __dietlibc__
  62 +# include <strings.h>
  63 +# include <limits.h>
  64 +# if __WORDSIZE == 64
  65 +#  define INT64_C(c)    c ## L
  66 +# else
  67 +#  define INT64_C(c)    c ## LL
  68 +# endif
  69 +# define UINT32_C(c)    c ## U
  70 +# if __WORDSIZE == 64
  71 +#  define UINT64_C(c)   c ## UL
  72 +# else
  73 +#  define UINT64_C(c)   c ## ULL
  74 +# endif
  75 +#endif
  76 +
  77  #endif
  78 --- LVM2.2.02.45/tools/tools.h  2008-11-04 15:57:06.000000000 +0100
  79 +++ LVM2.2.02.45-diet/tools/tools.h     2009-03-18 12:24:58.000000000 +0100
  80 @@ -55,6 +55,21 @@
  81  #include <stdarg.h>
  82  #include <sys/types.h>
  83
  84 +#ifdef __dietlibc__
  85 +# include <limits.h>
  86 +# if __WORDSIZE == 64
  87 +#  define INT64_C(c)    c ## L
  88 +# else
  89 +#  define INT64_C(c)    c ## LL
  90 +# endif
  91 +# define UINT32_C(c)    c ## U
  92 +# if __WORDSIZE == 64
  93 +#  define UINT64_C(c)   c ## UL
  94 +# else
  95 +#  define UINT64_C(c)   c ## ULL
  96 +# endif
  97 +#endif
  98 +
  99  #define CMD_LEN 256
 100  #define MAX_ARGS 64
 101
 102 --- LVM2.2.02.45/lib/report/report.c    2009-02-09 10:45:49.000000000 +0100
 103 +++ LVM2.2.02.45-diet/lib/report/report.c       2009-03-18 12:45:23.000000000 +0100
 104 @@ -24,6 +24,11 @@
 105  #include "str_list.h"
 106  #include "lvmcache.h"
 107
 108 +#ifdef __dietlibc__
 109 +#define __UINT64_C(c) c ## ULL
 110 +# define UINT64_MAX             (__UINT64_C(18446744073709551615))
 111 +#endif
 112 +
 113  struct lvm_report_object {
 114         struct volume_group *vg;
 115         struct logical_volume *lv;
 116 --- LVM2.2.02.45/tools/dmsetup.c        2008-10-30 18:52:06.000000000 +0100
 117 +++ LVM2.2.02.45-diet/tools/dmsetup.c   2009-03-18 12:47:46.000000000 +0100
 118 @@ -40,6 +40,23 @@
 119  #include <fcntl.h>
 120  #include <sys/stat.h>
 121
 122 +#ifdef __dietlibc__
 123 +# include <limits.h>
 124 +# if __WORDSIZE == 64
 125 +#  define INT64_C(c)    c ## L
 126 +# else
 127 +#  define INT64_C(c)    c ## LL
 128 +# endif
 129 +# define UINT32_C(c)    c ## U
 130 +# if __WORDSIZE == 64
 131 +#  define UINT64_C(c)   c ## UL
 132 +# else
 133 +#  define UINT64_C(c)   c ## ULL
 134 +# endif
 135 +#define canonicalize_file_name(x) realpath(x, NULL)
 136 +#endif
 137 +#include <strings.h>
 138 +
 139  /* FIXME Unused so far */
 140  #undef HAVE_SYS_STATVFS_H
 141
 142 --- LVM2.2.02.65/tools/Makefile.in~     2010-05-18 13:18:54.344217166 +0200
 143 +++ LVM2.2.02.65/tools/Makefile.in      2010-05-18 13:21:19.303172002 +0200
 144 @@ -122,18 +122,18 @@
 145  device-mapper: $(TARGETS_DM)
 146
 147  dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
 148 -       $(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
 149 +       $(CC) $(CFLAGS) -L$(interfacedir) -L$(top_builddir)/libdm $(LDFLAGS) \
 150               -o $@ dmsetup.o -ldevmapper $(LIBS)
 151
 152  dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
 153 -       $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
 154 -             -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
 155 +       $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
 156 +             -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
 157
 158  all: device-mapper
 159
 160  lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
 161 -       $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
 162 +       $(CC) $(CFLAGS) -L$(interfacedir) $(LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
 163                 $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
 164
 165  lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
 166
 167 --- LVM2.2.02.65/tools/Makefile.in~     2010-05-18 13:39:46.797633173 +0200
 168 +++ LVM2.2.02.65/tools/Makefile.in      2010-05-18 13:46:01.629690313 +0200
 169 @@ -137,7 +137,7 @@
 170
 171  lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
 172         $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
 173 -             $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
 174 +             $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
 175
 176  liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
 177         cat $(top_builddir)/lib/liblvm-internal.a > $@
 178 --- LVM2.2.02.75/lib/metadata/pv.c.orig 2010-09-30 22:47:18.000000000 +0200
 179 +++ LVM2.2.02.75/lib/metadata/pv.c      2010-11-06 12:05:40.672884033 +0100
 180 @@ -17,6 +17,12 @@
 181  #include "metadata.h"
 182  #include "lvmcache.h"
 183
 184 +#ifdef __dietlibc__
 185 +# ifndef UINT64_MAX
 186 +#  define UINT64_MAX             __UINT64_MAX__
 187 +# endif
 188 +#endif
 189 +
 190  /*
 191   * FIXME: Check for valid handle before dereferencing field or log error?
 192   */