mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-10 05:18:36 +03:00
Introduce lvm2_install target.
Buildsystem support device-mapper only install, but generic install tagret includes both dm+lvm2. For distribution which uses separate install_device-mapper, there is no way how to install lvm2 only (so after installing lvm2 for packaging purposes built system must remove installed device-mapper files). Fix it by allowing lvm2_install target, similarily like install_cluster for clvmd. (install = install_device-mapper + install_lvm2)
This commit is contained in:
parent
13cd91bffb
commit
d57543b220
@ -1,5 +1,6 @@
|
||||
Version 2.02.46 -
|
||||
================================
|
||||
Add make install_lvm2 as complement to device-mapper install.
|
||||
Reject missing PVs from allocation in toollib.
|
||||
Fix PV datalignment for values starting prior to MDA area. (2.02.45)
|
||||
Add sparse devices: lvcreate -s --virtualoriginsize (hidden zero origin).
|
||||
|
@ -31,7 +31,9 @@ LIB_VERSION = $(LIB_VERSION_LVM)
|
||||
|
||||
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) $< \
|
||||
$(libdir)/$<.$(LIB_VERSION)
|
||||
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
|
||||
|
||||
install: install_lvm2
|
||||
|
@ -31,7 +31,9 @@ LIB_VERSION = $(LIB_VERSION_LVM)
|
||||
|
||||
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) $< \
|
||||
$(libdir)/$<.$(LIB_VERSION)
|
||||
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
|
||||
|
||||
install: install_lvm2
|
||||
|
@ -20,10 +20,11 @@ CONFDEST=lvm.conf
|
||||
|
||||
include $(top_srcdir)/make.tmpl
|
||||
|
||||
install:
|
||||
install_lvm2:
|
||||
@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
|
||||
echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
|
||||
@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
|
||||
$(confdir)/$(CONFDEST); \
|
||||
fi
|
||||
|
||||
install: install_lvm2
|
||||
|
@ -45,5 +45,7 @@ install_cluster:
|
||||
|
||||
install_device-mapper:
|
||||
|
||||
install_lvm2:
|
||||
|
||||
cflow:
|
||||
|
||||
|
@ -126,7 +126,7 @@ OBJECTS = $(SOURCES:%.c=%.o)
|
||||
POTFILES = $(SOURCES:%.c=%.pot)
|
||||
|
||||
.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)
|
||||
@ -135,6 +135,7 @@ SUBDIRS.device-mapper := $(SUBDIRS:=.device-mapper)
|
||||
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)
|
||||
@ -147,6 +148,7 @@ all: $(SUBDIRS) $(TARGETS)
|
||||
install: all $(SUBDIRS.install)
|
||||
install_cluster: all $(SUBDIRS.install_cluster)
|
||||
install_device-mapper: $(SUBDIRS.install_device-mapper)
|
||||
install_lvm2: $(SUBDIRS.install_lvm2)
|
||||
|
||||
$(SUBDIRS): $(SUBDIRS.device-mapper)
|
||||
$(MAKE) -C $@
|
||||
@ -163,6 +165,9 @@ $(SUBDIRS.install_cluster): $(SUBDIRS)
|
||||
$(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
|
||||
|
||||
|
@ -57,7 +57,7 @@ $(MAN5) $(MAN8) $(MAN8CLUSTER): Makefile
|
||||
%: %.in
|
||||
$(SED) -e "s/#VERSION#/$(LVM_VERSION)/" $< > $@
|
||||
|
||||
install: install_device-mapper
|
||||
install_lvm2:
|
||||
@echo "Installing $(MAN8) in $(MAN8DIR)"
|
||||
@for f in $(MAN8); \
|
||||
do \
|
||||
@ -87,3 +87,5 @@ install_device-mapper:
|
||||
$(RM) $(MAN8DIR)/$$f; \
|
||||
@INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
|
||||
done
|
||||
|
||||
install: install_lvm2 install_device-mapper
|
||||
|
@ -17,6 +17,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(top_srcdir)/make.tmpl
|
||||
|
||||
install_lvm2: install
|
||||
|
||||
install:
|
||||
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \
|
||||
$(sbindir)/lvmdump
|
||||
|
@ -195,4 +195,6 @@ install_dmsetup_static: dmsetup.static
|
||||
|
||||
install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
|
||||
|
||||
install: $(INSTALL_LVM_TARGETS) install_device-mapper
|
||||
install_lvm2: $(INSTALL_LVM_TARGETS)
|
||||
|
||||
install: install_lvm2 install_device-mapper
|
||||
|
Loading…
Reference in New Issue
Block a user