1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

build: remove --with-{snapshots,mirrors,raid,thin,cache} options from ./configure

It now behaves as if the were all set as 'internal'
This commit is contained in:
Joe Thornber 2018-04-30 10:11:23 +01:00
parent 545ca59468
commit 2bc896f2a3
10 changed files with 12 additions and 205 deletions

View File

@ -1,5 +1,10 @@
Version 2.02.178 - Version 2.02.178 -
===================================== =====================================
--with-snapshots switch for ./configure has been removed.
--with-mirrors switch for ./configure has been removed.
--with-raid switch for ./configure has been removed.
--with-thin switch for ./configure has been removed.
--with-cache switch for ./configure has been removed.
Extend validation of region_size for mirror segment. Extend validation of region_size for mirror segment.
Reload whole device stack when reinitilizing mirror log. Reload whole device stack when reinitilizing mirror log.
Mirrors without monitoring are WARNING and not blocking on error. Mirrors without monitoring are WARNING and not blocking on error.

View File

@ -16,23 +16,7 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
SUBDIRS += lvm2 SUBDIRS += lvm2 snapshot raid thin mirrors
ifneq ("@MIRRORS@", "none")
SUBDIRS += mirror
endif
ifneq ("@SNAPSHOTS@", "none")
SUBDIRS += snapshot
endif
ifneq ("@RAID@", "none")
SUBDIRS += raid
endif
ifneq ("@THIN@", "none")
SUBDIRS += thin
endif
ifeq ($(MAKECMDGOALS),distclean) ifeq ($(MAKECMDGOALS),distclean)
SUBDIRS = lvm2 mirror snapshot raid thin SUBDIRS = lvm2 mirror snapshot raid thin

View File

@ -24,26 +24,6 @@ ifeq ("@POOL@", "shared")
SUBDIRS += format_pool SUBDIRS += format_pool
endif endif
ifeq ("@SNAPSHOTS@", "shared")
SUBDIRS += snapshot
endif
ifeq ("@MIRRORS@", "shared")
SUBDIRS += mirror
endif
ifeq ("@RAID@", "shared")
SUBDIRS += raid
endif
ifeq ("@THIN@", "shared")
SUBDIRS += thin
endif
ifeq ("@CACHE@", "shared")
SUBDIRS += cache_segtype
endif
ifeq ("@CLUSTER@", "shared") ifeq ("@CLUSTER@", "shared")
SUBDIRS += locking SUBDIRS += locking
endif endif
@ -51,6 +31,7 @@ endif
SOURCES =\ SOURCES =\
activate/activate.c \ activate/activate.c \
cache/lvmcache.c \ cache/lvmcache.c \
cache_segtype/cache.c \
commands/toolcontext.c \ commands/toolcontext.c \
config/config.c \ config/config.c \
datastruct/btree.c \ datastruct/btree.c \
@ -108,6 +89,7 @@ SOURCES =\
metadata/snapshot_manip.c \ metadata/snapshot_manip.c \
metadata/thin_manip.c \ metadata/thin_manip.c \
metadata/vg.c \ metadata/vg.c \
mirror/mirrored.c \
misc/crc.c \ misc/crc.c \
misc/lvm-exec.c \ misc/lvm-exec.c \
misc/lvm-file.c \ misc/lvm-file.c \
@ -121,9 +103,12 @@ SOURCES =\
mm/memlock.c \ mm/memlock.c \
notify/lvmnotify.c \ notify/lvmnotify.c \
properties/prop_common.c \ properties/prop_common.c \
raid/raid.c \
report/properties.c \ report/properties.c \
report/report.c \ report/report.c \
snapshot/snapshot.c \
striped/striped.c \ striped/striped.c \
thin/thin.c \
uuid/uuid.c \ uuid/uuid.c \
zero/zero.c zero/zero.c
@ -150,26 +135,6 @@ ifeq ("@CLUSTER@", "internal")
SOURCES += locking/cluster_locking.c SOURCES += locking/cluster_locking.c
endif endif
ifeq ("@SNAPSHOTS@", "internal")
SOURCES += snapshot/snapshot.c
endif
ifeq ("@MIRRORS@", "internal")
SOURCES += mirror/mirrored.c
endif
ifeq ("@RAID@", "internal")
SOURCES += raid/raid.c
endif
ifeq ("@THIN@", "internal")
SOURCES += thin/thin.c
endif
ifeq ("@CACHE@", "internal")
SOURCES += cache_segtype/cache.c
endif
ifeq ("@DEVMAPPER@", "yes") ifeq ("@DEVMAPPER@", "yes")
SOURCES +=\ SOURCES +=\
activate/dev_manager.c \ activate/dev_manager.c \
@ -204,12 +169,7 @@ ifeq ($(MAKECMDGOALS),distclean)
SUBDIRS =\ SUBDIRS =\
format1 \ format1 \
format_pool \ format_pool \
snapshot \
mirror \
notify \ notify \
raid \
thin \
cache_segtype \
locking locking
endif endif

View File

@ -1,24 +0,0 @@
# Copyright (C) 2013-2014 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
# of the GNU General Public License v.2.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
SOURCES = cache.c
LIB_SHARED = liblvm2cache.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
install: install_lvm2_plugin

View File

@ -1,26 +0,0 @@
#
# Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
# of the GNU General Public License v.2.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
SOURCES = mirrored.c
LIB_SHARED = liblvm2mirror.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
install: install_lvm2_plugin

View File

@ -1,26 +0,0 @@
#
# Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
# of the GNU General Public License v.2.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
SOURCES = raid.c
LIB_SHARED = liblvm2raid.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
install: install_lvm2_plugin

View File

@ -1,26 +0,0 @@
#
# Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
# of the GNU General Public License v.2.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
SOURCES = snapshot.c
LIB_SHARED = liblvm2snapshot.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
install: install_lvm2_plugin

View File

@ -1,25 +0,0 @@
#
# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
# of the GNU General Public License v.2.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
SOURCES = thin.c
LIB_SHARED = liblvm2thin.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
install: install_lib_shared_plugin

View File

@ -64,7 +64,6 @@ ifeq ($(MAN_ALL),"yes")
MAN8+=$(FSADMMAN) $(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(LVMDBUSDMAN) MAN8+=$(FSADMMAN) $(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(LVMDBUSDMAN)
MAN8DM+=$(BLKDEACTIVATEMAN) $(DMEVENTDMAN) $(DMFILEMAPDMAN) MAN8DM+=$(BLKDEACTIVATEMAN) $(DMEVENTDMAN) $(DMFILEMAPDMAN)
MAN8CLUSTER+=$(CLVMDMAN) $(CMIRRORDMAN) MAN8CLUSTER+=$(CLVMDMAN) $(CMIRRORDMAN)
MAN7+=$(LVMCACHEMAN) $(LVMTHINMAN) $(LVMRAIDMAN)
else else
ifeq ("@FSADM@", "yes") ifeq ("@FSADM@", "yes")
MAN8+=$(FSADMMAN) MAN8+=$(FSADMMAN)
@ -105,20 +104,9 @@ else
ifeq ("@BUILD_CMIRRORD@", "yes") ifeq ("@BUILD_CMIRRORD@", "yes")
MAN8CLUSTER+=$(CMIRRORDMAN) MAN8CLUSTER+=$(CMIRRORDMAN)
endif endif
ifneq ("@CACHE@", "none")
MAN7+=$(LVMCACHEMAN)
endif
ifneq ("@THIN@", "none")
MAN7+=$(LVMTHINMAN)
endif
ifneq ("@RAID@", "none")
MAN7+=$(LVMRAIDMAN)
endif
endif endif
MAN7+=$(LVMCACHEMAN) $(LVMTHINMAN) $(LVMRAIDMAN)
MAN5DIR=$(mandir)/man5 MAN5DIR=$(mandir)/man5
MAN7DIR=$(mandir)/man7 MAN7DIR=$(mandir)/man7
MAN8DIR=$(mandir)/man8 MAN8DIR=$(mandir)/man8

View File

@ -275,9 +275,6 @@ lib/flavour-%: $(srcdir)/lib/flavour-%.sh .lib-dir-stamp
lib/paths-common: $(srcdir)/Makefile.in .lib-dir-stamp Makefile lib/paths-common: $(srcdir)/Makefile.in .lib-dir-stamp Makefile
echo 'DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t echo 'DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
echo 'THIN=@THIN@' >> $@-t
echo 'RAID=@RAID@' >> $@-t
echo 'CACHE=@CACHE@' >> $@-t
echo 'LVMETAD_PIDFILE="@LVMETAD_PIDFILE@"' >> $@-t echo 'LVMETAD_PIDFILE="@LVMETAD_PIDFILE@"' >> $@-t
echo 'LVMPOLLD_PIDFILE="@LVMPOLLD_PIDFILE@"' >> $@-t echo 'LVMPOLLD_PIDFILE="@LVMPOLLD_PIDFILE@"' >> $@-t
echo 'DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t echo 'DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t