r687 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Mon Aug 17 10:59:55 UTC 2009
Author: waldi
Date: Mon Aug 17 10:59:54 2009
New Revision: 687
Log:
* debian/changelog: Set version to 2.02.51-1.
* debian/patches: Update.
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/patches/config.patch
lvm2/trunk/debian/patches/dmsetup-export.patch
lvm2/trunk/debian/patches/drop-realtime.patch
lvm2/trunk/debian/patches/force-modprobe.patch
lvm2/trunk/debian/patches/install.patch
lvm2/trunk/debian/patches/libdm-abi.patch
lvm2/trunk/debian/patches/libdm-atomic.patch
lvm2/trunk/debian/patches/libs-cleanup.patch
lvm2/trunk/debian/patches/rules-subdir.patch
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/changelog Mon Aug 17 10:59:54 2009 (r687)
@@ -1,5 +1,6 @@
-lvm2 (2.02.44-4) UNRELEASED; urgency=low
+lvm2 (2.02.51-1) UNRELEASED; urgency=low
+ * New upstream version.
* Add multipath as prereq of initramfs-tools script. (closes: #511903)
* Fix LSB header of init script. (closes: #514665)
Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/config.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,6 +1,6 @@
--- a/doc/example.conf
+++ b/doc/example.conf
-@@ -264,7 +264,7 @@
+@@ -294,7 +294,7 @@
# Full pathnames can be given.
# Search this directory first for shared libraries.
Modified: lvm2/trunk/debian/patches/dmsetup-export.patch
==============================================================================
--- lvm2/trunk/debian/patches/dmsetup-export.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/dmsetup-export.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,6 +1,6 @@
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
-@@ -1075,6 +1075,82 @@
+@@ -1333,6 +1333,82 @@
return r;
}
@@ -83,10 +83,10 @@
/* Show target names and their version numbers */
static int _targets(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
-@@ -2121,6 +2197,7 @@
- {"targets", "", 0, 0, _targets},
+@@ -2434,6 +2510,7 @@
{"version", "", 0, 0, _version},
{"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, _setgeometry},
+ {"splitname", "<device> [<subsystem>]", 1, 2, _splitname},
+ {"export", "<device> | -j|--major <major> -m|--minor <minor>", 0, 1, _export},
{NULL, NULL, 0, 0, NULL}
};
Modified: lvm2/trunk/debian/patches/drop-realtime.patch
==============================================================================
--- lvm2/trunk/debian/patches/drop-realtime.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/drop-realtime.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,6 +1,6 @@
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
-@@ -80,7 +80,6 @@
+@@ -81,7 +81,6 @@
misc/lvm-globals.c \
misc/lvm-string.c \
misc/lvm-wrappers.c \
@@ -179,7 +179,7 @@
-
--- a/configure.in
+++ b/configure.in
-@@ -38,7 +38,6 @@
+@@ -39,7 +39,6 @@
ODIRECT=yes
DM_IOCTLS=yes
SELINUX=yes
@@ -187,7 +187,7 @@
CLUSTER=internal
FSADM=yes
;;
-@@ -53,7 +52,6 @@
+@@ -54,7 +53,6 @@
ODIRECT=no
DM_IOCTLS=no
SELINUX=no
@@ -195,7 +195,7 @@
CLUSTER=none
FSADM=no
;;
-@@ -313,13 +311,6 @@
+@@ -314,13 +312,6 @@
AC_MSG_RESULT($READLINE)
################################################################################
@@ -209,7 +209,7 @@
dnl -- Build cluster LVM daemon
AC_MSG_CHECKING(whether to build cluster LVM daemon)
AC_ARG_WITH(clvmd,
-@@ -532,19 +523,6 @@
+@@ -557,19 +548,6 @@
fi
################################################################################
@@ -229,7 +229,7 @@
dnl -- Check for getopt
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
-@@ -722,7 +700,6 @@
+@@ -778,7 +756,6 @@
AC_SUBST(FSADM)
AC_SUBST(GROUP)
AC_SUBST(HAVE_LIBDL)
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -638,11 +638,7 @@
+@@ -663,11 +663,7 @@
fi
################################################################################
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/install.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,22 +1,22 @@
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -156,21 +156,21 @@
+@@ -160,21 +160,21 @@
endif
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+ $(INSTALL) -D liblvm2cmd.$(LIB_SUFFIX) \
- $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION_LVM)
- $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION_LVM) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
+ $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
+ $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+ $(INSTALL_DATA) -D lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_cmdlib_static: liblvm2cmd-static.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
-+ $(INSTALL) liblvm2cmd-static.a \
- $(libdir)/liblvm2cmd.a.$(LIB_VERSION_LVM)
- $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION_LVM) $(libdir)/liblvm2cmd.a
++ $(INSTALL) -D liblvm2cmd-static.a \
+ $(libdir)/liblvm2cmd.a.$(LIB_VERSION)
+ $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+ $(INSTALL_DATA) -D lvm2cmd.h \
$(includedir)/lvm2cmd.h
@@ -27,7 +27,7 @@
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
-@@ -181,14 +181,13 @@
+@@ -185,14 +185,13 @@
)
install_tools_static: lvm.static
@@ -47,7 +47,7 @@
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
-@@ -104,8 +104,8 @@
+@@ -107,8 +107,8 @@
.PHONY: install_clvmd
install_clvmd: $(TARGETS)
@@ -144,16 +144,18 @@
done
install_device-mapper:
-@@ -85,5 +85,5 @@
+@@ -85,7 +85,7 @@
@for f in $(MAN8DM); \
do \
$(RM) $(MAN8DIR)/$$f; \
- @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+ $(INSTALL_DATA) -D $$f $(MAN8DIR)/$$f; \
done
+
+ install: install_lvm2 install_device-mapper
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
-@@ -55,11 +55,7 @@
+@@ -57,11 +57,7 @@
install_ioctl install_ioctl_static \
install_pkgconfig
@@ -166,7 +168,7 @@
ifeq ("@PKGCONFIG@", "yes")
INSTALL_TYPE += install_pkgconfig
-@@ -70,7 +66,7 @@
+@@ -72,7 +68,7 @@
install_device-mapper: install
install_include:
@@ -175,7 +177,7 @@
$(includedir)/libdevmapper.h
install_dynamic: install_ at interface@
-@@ -78,19 +74,17 @@
+@@ -80,19 +76,17 @@
$(libdir)/libdevmapper.$(LIB_SUFFIX)
install_static: install_ at interface@_static
@@ -200,8 +202,8 @@
rm -f $@
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
-@@ -64,25 +64,21 @@
- install_device-mapper: install
+@@ -66,25 +66,21 @@
+ install_device-mapper: $(INSTALL_TYPE) install_include install_dmeventd
install_include:
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \
@@ -233,28 +235,30 @@
$(VERSIONED_SHLIB): $(LIB_SHARED)
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
-@@ -32,6 +32,6 @@
+@@ -32,7 +32,7 @@
include $(top_srcdir)/make.tmpl
- install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
+ install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -D $< \
$(libdir)/$<.$(LIB_VERSION)
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
-@@ -32,6 +32,6 @@
+@@ -32,7 +32,7 @@
include $(top_srcdir)/make.tmpl
- install: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
+ install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -D $< \
$(libdir)/$<.$(LIB_VERSION)
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -23,7 +23,7 @@
- install:
+ install_lvm2:
@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
- @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
@@ -272,7 +276,7 @@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
LCOV = @LCOV@
-@@ -54,11 +55,6 @@
+@@ -56,11 +57,6 @@
interface = @interface@
interfacedir = $(top_srcdir)/libdm/$(interface)
@@ -284,7 +288,7 @@
# The number of jobs to run, if blank, defaults to the make standard
ifndef MAKEFLAGS
MAKEFLAGS = @JOBS@
-@@ -105,9 +101,6 @@
+@@ -107,9 +103,6 @@
#CFLAGS += -pg
#LDFLAGS += -pg
@@ -296,15 +300,37 @@
LIB_VERSION_LVM := $(shell cat $(top_srcdir)/VERSION | \
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
-@@ -18,9 +18,9 @@
+@@ -18,12 +18,12 @@
include $(top_srcdir)/make.tmpl
install:
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \
+ $(INSTALL) -D lvm_dump.sh \
$(sbindir)/lvmdump
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) vgimportclone.sh \
++ $(INSTALL) -D vgimportclone.sh \
+ $(sbindir)/vgimportclone
ifeq ("@FSADM@", "yes")
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm.sh \
+ $(INSTALL) -D fsadm.sh \
$(sbindir)/fsadm
endif
+
+--- a/po/Makefile.in
++++ b/po/Makefile.in
+@@ -53,13 +53,13 @@
+ @echo Installing translation files in $(localedir)
+ @( \
+ for lang in $(LANGS); do \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
++ $(INSTALL_DATA) -D $$lang.mo \
+ $(localedir)/$$lang/LC_MESSAGES/lvm2.mo;\
+ done; \
+ )
+ @( \
+ for lang in $(LANGS); do \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
++ $(INSTALL_DATA) -D $$lang.mo \
+ $(localedir)/$$lang/LC_MESSAGES/device-mapper.mo;\
+ done; \
+ )
Modified: lvm2/trunk/debian/patches/libdm-abi.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-abi.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/libdm-abi.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,6 +1,6 @@
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
-@@ -240,9 +240,9 @@
+@@ -301,9 +301,9 @@
return 1;
}
@@ -11,7 +11,7 @@
security_context_t scontext;
if (is_selinux_enabled() <= 0)
-@@ -263,9 +263,9 @@
+@@ -324,9 +324,9 @@
}
freecon(scontext);
@@ -22,7 +22,7 @@
static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
uid_t uid, gid_t gid, mode_t mode)
-@@ -309,10 +309,8 @@
+@@ -372,10 +372,8 @@
log_debug("Created %s", path);
Modified: lvm2/trunk/debian/patches/libdm-atomic.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-atomic.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/libdm-atomic.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,6 +1,6 @@
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
-@@ -270,12 +270,19 @@
+@@ -331,12 +331,19 @@
static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
uid_t uid, gid_t gid, mode_t mode)
{
@@ -21,17 +21,8 @@
if (stat(path, &info) >= 0) {
if (!S_ISBLK(info.st_mode)) {
-@@ -287,32 +294,35 @@
- /* If right inode already exists we don't touch uid etc. */
- if (info.st_rdev == dev)
- return 1;
--
-- if (unlink(path) < 0) {
-- log_error("Unable to unlink device node for '%s'",
-- dev_name);
-- return 0;
-- }
- }
+@@ -359,23 +366,32 @@
+ "node creation.", path);
old_mask = umask(0);
- if (mknod(path, S_IFBLK | mode, dev) < 0) {
@@ -69,4 +60,4 @@
+ return 0;
}
- static int _rename_dev_node(const char *old_name, const char *new_name)
+ static int _rm_dev_node(const char *dev_name)
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -33,7 +33,6 @@
+@@ -34,7 +34,6 @@
CLDWHOLEARCHIVE="-Wl,-whole-archive"
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
LDDEPS="$LDDEPS .export.sym"
@@ -8,7 +8,7 @@
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
-@@ -479,24 +478,6 @@
+@@ -522,24 +521,6 @@
fi;
################################################################################
@@ -33,7 +33,7 @@
dnl -- Check for dlopen
AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
-@@ -527,34 +508,9 @@
+@@ -570,34 +551,9 @@
################################################################################
dnl -- Check for selinux
if test x$SELINUX = xyes; then
@@ -71,7 +71,7 @@
fi
################################################################################
-@@ -578,7 +534,7 @@
+@@ -621,7 +577,7 @@
dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
if test x$READLINE != xno; then
rl_found=yes
@@ -80,7 +80,7 @@
test x$READLINE:$rl_found = xyes:no &&
AC_MSG_ERROR(
GNU Readline could not be found which is required for the
-@@ -755,6 +711,9 @@
+@@ -829,6 +785,9 @@
AC_SUBST(JOBS)
AC_SUBST(LDDEPS)
AC_SUBST(LIBS)
@@ -90,17 +90,17 @@
AC_SUBST(LIB_SUFFIX)
AC_SUBST(LOCALEDIR)
AC_SUBST(LVM1)
-@@ -769,7 +728,6 @@
- AC_SUBST(SNAPSHOTS)
+@@ -851,7 +810,6 @@
AC_SUBST(STATICDIR)
AC_SUBST(STATIC_LINK)
+ AC_SUBST(UDEV_RULES)
-AC_SUBST([LIB_PTHREAD])
AC_SUBST(interface)
AC_SUBST(kerneldir)
AC_SUBST(missingkernel)
--- a/lib/activate/fs.c
+++ b/lib/activate/fs.c
-@@ -174,10 +174,8 @@
+@@ -196,10 +196,8 @@
return 0;
}
@@ -113,7 +113,7 @@
}
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -95,6 +95,9 @@
+@@ -99,6 +99,9 @@
LVMLIBS += -ldevmapper
@@ -123,26 +123,26 @@
DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
include $(top_srcdir)/make.tmpl
-@@ -107,14 +110,13 @@
+@@ -111,14 +114,13 @@
dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
-- -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) \
+- -L$(interfacedir) -ldevmapper $(LIBS) \
- $(LIB_PTHREAD)
-+ -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) $(LDFLAGS_DMSETUP_STATIC)
++ -L$(interfacedir) -ldevmapper $(LIBS) $(LDFLAGS_DMSETUP_STATIC)
all: device-mapper
- lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
+ lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm-internal.a
$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
- $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
+ $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LDFLAGS_LVM) -rdynamic
LIB_PTHREAD = @LIB_PTHREAD@
- lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
+ lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm-internal.a $(interfacedir)/libdevmapper.a
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
-@@ -44,7 +44,7 @@
+@@ -46,7 +46,7 @@
dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \
@@ -153,7 +153,7 @@
install_pkgconfig install_dmeventd
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
-@@ -44,6 +44,8 @@
+@@ -46,6 +46,8 @@
VERSIONED_SHLIB = libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
LIB_VERSION = $(LIB_VERSION_DM)
@@ -164,7 +164,7 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -99,7 +99,6 @@
+@@ -101,7 +101,6 @@
#DEFS += -DBOUNDS_CHECK
#CFLAGS += -pg
@@ -172,7 +172,7 @@
LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
-@@ -195,13 +194,13 @@
+@@ -201,13 +200,13 @@
ifeq ("@LIB_SUFFIX@","so")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch Wed May 6 11:32:54 2009 (r686)
+++ lvm2/trunk/debian/patches/rules-subdir.patch Mon Aug 17 10:59:54 2009 (r687)
@@ -1,9 +1,9 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -123,60 +123,26 @@
+@@ -124,65 +124,26 @@
.PHONY: all install install_cluster pofile distclean clean cflow device-mapper
- .PHONY: install_device-mapper
+ .PHONY: install_device-mapper install_lvm2
-.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
-.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
-.PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -12,6 +12,7 @@
-SUBDIRS.install := $(SUBDIRS:=.install)
-SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster)
-SUBDIRS.install_device-mapper := $(SUBDIRS:=.install_device-mapper)
+-SUBDIRS.install_lvm2 := $(SUBDIRS:=.install_lvm2)
-SUBDIRS.pofile := $(SUBDIRS:=.pofile)
-SUBDIRS.cflow := $(SUBDIRS:=.cflow)
-SUBDIRS.clean := $(SUBDIRS:=.clean)
@@ -25,8 +26,9 @@
-install: all $(SUBDIRS.install)
-install_cluster: all $(SUBDIRS.install_cluster)
-install_device-mapper: $(SUBDIRS.install_device-mapper)
+-install_lvm2: $(SUBDIRS.install_lvm2)
-
--$(SUBDIRS):
+-$(SUBDIRS): $(SUBDIRS.device-mapper)
- $(MAKE) -C $@
-
-$(SUBDIRS.device-mapper):
@@ -41,6 +43,9 @@
-$(SUBDIRS.install_device-mapper): device-mapper
- $(MAKE) -C $(@:.install_device-mapper=) install_device-mapper
-
+-$(SUBDIRS.install_lvm2): $(SUBDIRS)
+- $(MAKE) -C $(@:.install_lvm2=) install_lvm2
+-
-$(SUBDIRS.clean):
- -$(MAKE) -C $(@:.clean=) clean
-
@@ -72,7 +77,7 @@
endif
$(TARGETS): $(OBJECTS)
-@@ -223,12 +189,12 @@
+@@ -229,12 +190,12 @@
%.mo: %.po
$(MSGFMT) -o $@ $<
@@ -89,21 +94,22 @@
$(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
--- a/Makefile.in
+++ b/Makefile.in
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
SUBDIRS += po
endif
-SUBDIRS += lib tools daemons libdm
+SUBDIRS += libdm lib tools daemons
- ifeq ($(MAKECMDGOALS),distclean)
- SUBDIRS += daemons/clvmd \
-@@ -40,36 +40,6 @@
+ ifeq ("@APPLIB@", "yes")
+ SUBDIRS += liblvm
+@@ -50,31 +50,6 @@
include make.tmpl
-libdm: include
-lib: libdm
+-liblvm: lib
-daemons: lib tools
-tools: lib device-mapper
-po: tools daemons
@@ -126,15 +132,9 @@
-cflow: tools.cflow
-endif
-
--ifneq ("@CSCOPE_CMD@", "")
--cscope.out: tools
-- @CSCOPE_CMD@ -b -R
--all: cscope.out
--endif
--
- check: all
- $(MAKE) -C test all
-
+ ifneq ("@CSCOPE_CMD@", "")
+ cscope.out: tools
+ @CSCOPE_CMD@ -b -R
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -48,9 +48,7 @@
More information about the pkg-lvm-commits
mailing list