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