lvm2-commits December 2018

lvm2-commits@lists.fedorahosted.org

5 participants
96 discussions

master - unit test: use_lvmetad replaced by event_activation
by David Teigland 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1f1d36f6a2b441fbf84e5… Commit: 1f1d36f6a2b441fbf84e59f435bd5169459392b1 Parent: 2076dda0b8e6a33eec92a8e6b4616f8ab5a9b495 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Dec 17 10:04:44 2018 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Dec 17 10:04:44 2018 -0600 unit test: use_lvmetad replaced by event_activation --- test/unit/activation-generator_t.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c index f02da05..ef4946d 100644 --- a/test/unit/activation-generator_t.c +++ b/test/unit/activation-generator_t.c @@ -110,7 +110,7 @@ static void _test_parse_bool(void *fixture) struct pl_test { const char *input; bool success; - bool use_lvmetad; + bool event_activation; bool sysinit_needed; }; @@ -119,8 +119,8 @@ static void _test_parse_line(void *fixture) static struct pl_test _tests[] = { {"", false, false, false}, {"sldkjfs", false, false, false}, - {"use_lvmetad=1", true, true, true}, - {"use_lvmetad=0", true, false, true}, + {"event_activation=1", true, true, true}, + {"event_activation=0", true, false, true}, {"use_lvmpolld=1", true, false, false}, {"use_lvmpolld=0", true, false, true} }; @@ -139,9 +139,9 @@ static void _test_parse_line(void *fixture) if (!r) test_fail("_parse_line('%s') failed", t->input); - //if (cfg.use_lvmetad != t->use_lvmetad) - // test_fail("_parse_line('%s') -> use_lvmetad='%s'", - // t->input, _bool(cfg.use_lvmetad)); + //if (cfg.event_activation != t->event_activation) + // test_fail("_parse_line('%s') -> event_activation='%s'", + // t->input, _bool(cfg.event_activation)); if (cfg.sysinit_needed != t->sysinit_needed) test_fail("_parse_line('%s') -> sysinit_needed='%s'", @@ -170,7 +170,7 @@ static void _test_get_config_bad_exit(void *fixture) struct gc_test { const char *output; bool success; - bool use_lvmetad; + bool event_activation; bool sysinit_needed; }; @@ -199,9 +199,9 @@ static void _test_get_config(void *fixture) {"", true, false, true}, {"lsdjkf\n\n\n", false, false, false}, - {"use_lvmetad=0\nuse_lvmpolld=1\n", true, false, false}, - {"use_lvmetad=1\nuse_lvmpolld=1\n", true, true, false}, - {"use_lvmetad=1\nuse_lvmpolld=0\n", true, true, true}, + {"event_activation=0\nuse_lvmpolld=1\n", true, false, false}, + {"event_activation=1\nuse_lvmpolld=1\n", true, true, false}, + {"event_activation=1\nuse_lvmpolld=0\n", true, true, true}, }; bool r; @@ -223,9 +223,9 @@ static void _test_get_config(void *fixture) if (!r) test_fail("_get_config() <- '%s' failed", t->output); - //if (t->use_lvmetad != cfg.use_lvmetad) - // test_fail("_get_config() <- '%s', use_lvmetad = %s", - // t->output, _bool(cfg.use_lvmetad)); + //if (t->event_activation != cfg.event_activation) + // test_fail("_get_config() <- '%s', event_activation = %s", + // t->output, _bool(cfg.event_activation)); if (t->sysinit_needed != cfg.sysinit_needed) test_fail("_get_config() <- '%s', sysinit = %s",

1 0

master - makefiles: also fix build of unit test
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2076dda0b8e6a33eec92a… Commit: 2076dda0b8e6a33eec92a8e6b4616f8ab5a9b495 Parent: 5db56b36f168bddc4364fbffab1fcee07eb1d664 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 17 11:51:17 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 11:51:38 2018 +0100 makefiles: also fix build of unit test --- test/unit/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/unit/Makefile b/test/unit/Makefile index 0ff128d..7bc7117 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -45,7 +45,7 @@ CLEAN_TARGETS += $(UNIT_DEPENDS) $(UNIT_OBJECTS) \ $(UNIT_TARGET): $(UNIT_OBJECTS) $(LVMINTERNAL_LIBS) @echo " [LD] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \ - -o $@ $+ $(DMEVENT_LIBS) $(LIBS) -laio + -o $@ $+ $(DMEVENT_LIBS) $(SYSTEMD_LIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS) -laio .PHONEY: run-unit-test unit-test unit-test: $(UNIT_TARGET)

1 0

master - makefile: fixes build for older system
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5db56b36f168bddc4364f… Commit: 5db56b36f168bddc4364fbffab1fcee07eb1d664 Parent: 94237354ddbf2abc0f04e7f06ee3c1263dfc6b6e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 17 11:41:38 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 11:41:38 2018 +0100 makefile: fixes build for older system With older gcc - we need to resolve symbols linked with devmapper-event that is now using -ldevmapper. Also add forgotten systemd library needed for dbus notification. --- tools/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index b45798e..2620daa 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -89,7 +89,7 @@ ifeq ("@STATIC_LINK@", "yes") INSTALL_CMDLIB_TARGETS += install_cmdlib_static endif -LVMLIBS = $(LIBS) -laio +LVMLIBS = $(SYSTEMD_LIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS) -laio LIB_VERSION = $(LIB_VERSION_LVM) INCLUDES = -I$(top_builddir)/tools

1 0

master - makefiles: correcting login of makefile
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=94237354ddbf2abc0f04e… Commit: 94237354ddbf2abc0f04e7f06ee3c1263dfc6b6e Parent: 0dc7abe013729b3b3560b67fcc37f3cc619f323d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Dec 15 01:55:11 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 10:55:20 2018 +0100 makefiles: correcting login of makefile Fixing some ordering issue with inclusion of common make.tmpl. Correcting dependency calculation Simplifying inclusive makefile --- Makefile.in | 15 ++++++++------- base/Makefile | 21 ++++++++------------- device_mapper/Makefile | 21 ++++++++------------- libdm/Makefile.in | 2 +- make.tmpl.in | 26 ++++++++++---------------- scripts/Makefile.in | 4 ++-- test/unit/Makefile | 25 +++++++++++++------------ tools/Makefile.in | 15 ++++++++------- 8 files changed, 58 insertions(+), 71 deletions(-) diff --git a/Makefile.in b/Makefile.in index e64836f..a5eb004 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,16 +43,22 @@ DISTCLEAN_TARGETS += config.cache config.log config.status make.tmpl include make.tmpl +include $(top_srcdir)/base/Makefile +include $(top_srcdir)/device_mapper/Makefile +include $(top_srcdir)/test/unit/Makefile + libdm: include libdaemon: include -lib: libdm libdaemon +lib: libdaemon $(BASE_TARGET) $(DEVICE_MAPPER_TARGET) daemons: lib libdaemon tools -tools: lib libdaemon device-mapper +scripts: lib +tools: lib libdaemon po: tools daemons man: tools all_man: tools scripts: libdm test: tools daemons +unit-test run-unit-test: test lib.device-mapper: include.device-mapper libdm.device-mapper: include.device-mapper @@ -174,11 +180,6 @@ endif endif -# FIXME: Drop once top-level make is resolved --include $(top_srcdir)/test/unit/Makefile -include $(top_srcdir)/device_mapper/Makefile -include $(top_srcdir)/base/Makefile - ifneq ($(shell which ctags 2>/dev/null),) .PHONY: tags tags: diff --git a/base/Makefile b/base/Makefile index 6050c3a..9f8bccc 100644 --- a/base/Makefile +++ b/base/Makefile @@ -14,7 +14,7 @@ # Comment to build the advanced radix tree. #base/data-struct/radix-tree.o: CFLAGS += -DSIMPLE_RADIX_TREE -# NOTE: this include only works as 'include' for toplevel Makefile +# NOTE: this Makefile only works as 'include' for toplevel Makefile # which defined all top_* variables BASE_SOURCE=\ @@ -22,24 +22,19 @@ BASE_SOURCE=\ base/data-struct/list.c \ base/data-struct/radix-tree.c +BASE_TARGET = base/libbase.a BASE_DEPENDS = $(BASE_SOURCE:%.c=%.d) BASE_OBJECTS = $(BASE_SOURCE:%.c=%.o) CLEAN_TARGETS += $(BASE_DEPENDS) $(BASE_OBJECTS) \ $(BASE_SOURCE:%.c=%.gcda) \ - $(BASE_SOURCE:%.c=%.gcno) + $(BASE_SOURCE:%.c=%.gcno) \ + $(BASE_TARGET) -ifeq ("$(USE_TRACKING)","yes") -ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ - help check check_local check_cluster check_lvmetad check_lvmpolld)) - -include $(BASE_DEPENDS) -endif -endif - -$(BASE_OBJECTS): INCLUDES+=-I$(top_srcdir)/base/ - -base/libbase.a: $(BASE_OBJECTS) +$(BASE_TARGET): $(BASE_OBJECTS) @echo " [AR] $@" $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(BASE_OBJECTS) > /dev/null -CLEAN_TARGETS += base/libbase.a +ifeq ("$(DEPENDS)","yes") +-include $(BASE_DEPENDS) +endif diff --git a/device_mapper/Makefile b/device_mapper/Makefile index fd2189a..d3b791e 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -10,7 +10,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# NOTE: this include only works as 'include' for toplevel Makefile +# NOTE: this Makefile only works as 'include' for toplevel Makefile # which defined all top_* variables DEVICE_MAPPER_SOURCE=\ @@ -31,27 +31,22 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/vdo/status.c \ device_mapper/vdo/vdo_target.c +DEVICE_MAPPER_TARGET = device_mapper/libdevice-mapper.a DEVICE_MAPPER_DEPENDS = $(DEVICE_MAPPER_SOURCE:%.c=%.d) DEVICE_MAPPER_OBJECTS = $(DEVICE_MAPPER_SOURCE:%.c=%.o) CLEAN_TARGETS += $(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) \ $(DEVICE_MAPPER_SOURCE:%.c=%.gcda) \ - $(DEVICE_MAPPER_SOURCE:%.c=%.gcno) + $(DEVICE_MAPPER_SOURCE:%.c=%.gcno) \ + $(DEVICE_MAPPER_TARGET) #$(DEVICE_MAPPER_DEPENDS): INCLUDES+=$(VDO_INCLUDES) #$(DEVICE_MAPPER_OBJECTS): INCLUDES+=$(VDO_INCLUDES) -ifeq ("$(USE_TRACKING)","yes") -ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ - help check check_local check_cluster check_lvmetad check_lvmpolld)) - -include $(DEVICE_MAPPER_DEPENDS) -endif -endif - -$(DEVICE_MAPPER_OBJECTS): INCLUDES+=-I$(top_srcdir)/device_mapper/ - -device_mapper/libdevice-mapper.a: $(DEVICE_MAPPER_OBJECTS) +$(DEVICE_MAPPER_TARGET): $(DEVICE_MAPPER_OBJECTS) @echo " [AR] $@" $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(DEVICE_MAPPER_OBJECTS) > /dev/null -CLEAN_TARGETS += device_mapper/libdevice-mapper.a +ifeq ("$(DEPENDS)","yes") +-include $(DEVICE_MAPPER_DEPENDS) +endif diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 4ea83d0..e9bb5ae 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -58,7 +58,7 @@ include $(top_builddir)/libdm/make.tmpl PROGS_CFLAGS = $(UDEV_CFLAGS) -LIBS += $(RT_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) $(M_LIBS) +LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) $(RT_LIBS) $(M_LIBS) device-mapper: all diff --git a/make.tmpl.in b/make.tmpl.in index d7b6568..9158f0e 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -72,9 +72,6 @@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ -LVMINTERNAL_LIBS=\ - -llvm-internal \ - $(DAEMON_LIBS) $(DMEVENT_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ @@ -266,13 +263,6 @@ endif # end of fPIC protection endif -LDFLAGS += -L$(top_builddir)/lib -CLDFLAGS += -L$(top_builddir)/lib - -DAEMON_LIBS = -ldaemonclient -LDFLAGS += -L$(top_builddir)/libdaemon/client -CLDFLAGS += -L$(top_builddir)/libdaemon/client - ifeq ("@BUILD_DMEVENTD@", "yes") DMEVENT_LIBS = -ldevmapper-event LDFLAGS += -L$(top_builddir)/daemons/dmeventd @@ -338,11 +328,13 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean) TARGETS += $(LIB_SHARED) $(LIB_STATIC) -INTERNAL_LIBS=\ +INTERNAL_LIBS = \ + $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/device_mapper/libdevice-mapper.a \ $(top_builddir)/base/libbase.a - -all: $(INTERNAL_LIBS) $(SUBDIRS) $(TARGETS) +LVMINTERNAL_LIBS = $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) + +all: $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) @@ -351,7 +343,7 @@ install_lvm2: $(SUBDIRS.install_lvm2) install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) -$(SUBDIRS): $(SUBDIRS.device-mapper) $(INTERNAL_LIBS) +$(SUBDIRS): $(SUBDIRS.device-mapper) $(MAKE) -C $@ $(SUBDIRS.device-mapper): @@ -577,13 +569,15 @@ else endif ifeq ("$(USE_TRACKING)","yes") -ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \ - help check check_local check_cluster check_lvmpolld)) +ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ + help check check_local check_cluster check_lvmpolld run-unit-test tags)) +# Note: no tabs before -include ifdef SOURCES -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d) endif ifdef SOURCES2 -include $(SOURCES2:.c=.d) endif + DEPENDS = yes endif endif diff --git a/scripts/Makefile.in b/scripts/Makefile.in index ffca04a..e384397 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -76,9 +76,9 @@ endif CFLAGS_lvm2_activation_generator_systemd_red_hat.o += $(EXTRA_EXEC_CFLAGS) -lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) $(INTERNAL_LIBS) +lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(LVMINTERNAL_LIBS) @echo " [CC] $@" - $(Q) $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMLIBS) $(INTERNAL_LIBS) $(LIBS) + $(Q) $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMINTERNAL_LIBS) $(LIBS) install_systemd_generators: @echo " [INSTALL] $<" diff --git a/test/unit/Makefile b/test/unit/Makefile index 5b71e1b..0ff128d 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -10,6 +10,9 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# NOTE: this Makefile only works as 'include' for toplevel Makefile +# which defined all top_* variables + UNIT_SOURCE=\ device_mapper/vdo/status.c \ \ @@ -31,27 +34,25 @@ UNIT_SOURCE=\ test/unit/radix_tree_t.o: test/unit/rt_case1.c +UNIT_TARGET = test/unit/unit-test UNIT_DEPENDS = $(UNIT_SOURCE:%.c=%.d) UNIT_OBJECTS = $(UNIT_SOURCE:%.c=%.o) CLEAN_TARGETS += $(UNIT_DEPENDS) $(UNIT_OBJECTS) \ $(UNIT_SOURCE:%.c=%.gcda) \ $(UNIT_SOURCE:%.c=%.gcno) \ - test/unit/unit-test + $(UNIT_TARGET) -test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a libdaemon/client/libdaemonclient.a $(INTERNAL_LIBS) +$(UNIT_TARGET): $(UNIT_OBJECTS) $(LVMINTERNAL_LIBS) @echo " [LD] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \ - -o $@ $+ $(DMEVENT_LIBS) $(SYSTEMD_LIBS) $(LIBS) -laio + -o $@ $+ $(DMEVENT_LIBS) $(LIBS) -laio .PHONEY: run-unit-test unit-test -unit-test: test/unit/unit-test -run-unit-test: test/unit/unit-test - @echo Running unit tests - LD_LIBRARY_PATH=libdm test/unit/unit-test run +unit-test: $(UNIT_TARGET) +run-unit-test: $(UNIT_TARGET) + @echo "Running unit tests" + LD_LIBRARY_PATH=libdm $(UNIT_TARGET) run -ifeq ("$(USE_TRACKING)","yes") -ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ - help check check_local check_lvmpolld run-unit-test)) - -include $(UNIT_DEPENDS) -endif +ifeq ("$(DEPENDS)","yes") +-include $(UNIT_SOURCE:%.c=%.d) endif diff --git a/tools/Makefile.in b/tools/Makefile.in index 09768ed..b45798e 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -89,8 +89,9 @@ ifeq ("@STATIC_LINK@", "yes") INSTALL_CMDLIB_TARGETS += install_cmdlib_static endif -LVMLIBS = $(LVMINTERNAL_LIBS) -laio +LVMLIBS = $(LIBS) -laio LIB_VERSION = $(LIB_VERSION_LVM) +INCLUDES = -I$(top_builddir)/tools CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) lvm-static.o \ @@ -118,10 +119,10 @@ all: device-mapper CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS) -lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) +lvm: $(OBJECTS) lvm.o $(LVMINTERNAL_LIBS) @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $+ \ - $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -lm + $(DMEVENT_LIBS) $(READLINE_LIBS) $(LVMLIBS) DEFS_man-generator.o += -DMAN_PAGE_GENERATOR @@ -133,10 +134,10 @@ man-generator: man-generator.o @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) -o $@ $< -lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) +lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) @echo " [CC] $@" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ - $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \ + $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o @echo " [AR] $@" @@ -153,7 +154,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) $(Q) $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \ $(CFLAGS) $(CLDFLAGS) -o $@ \ @CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ \ - $(LVMLIBS) $(INTERNAL_LIBS) $(LIBS) + $(LVMINTERNAL_LIBS) $(LVMLIBS) liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX) @echo " [LN] $@"

1 0

master - makefiles: dm-tools improve Makefile
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0dc7abe013729b3b3560b… Commit: 0dc7abe013729b3b3560b67fcc37f3cc619f323d Parent: b5366b1d8d9edf8a21de4e256ff89774c6b87f16 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 17 02:07:29 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 10:55:20 2018 +0100 makefiles: dm-tools improve Makefile --- libdm/dm-tools/Makefile.in | 87 ++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 48 deletions(-) diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in index 33110dc..15a9d8e 100644 --- a/libdm/dm-tools/Makefile.in +++ b/libdm/dm-tools/Makefile.in @@ -1,6 +1,6 @@ # # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. +# Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -16,39 +16,49 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -SOURCES2=\ - dmsetup.c +all: device-mapper +SOURCES2 = dmsetup.c TARGETS_DM = dmsetup - -INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic +install_device-mapper: install_dmsetup_dynamic ifeq ("@STATIC_LINK@", "yes") TARGETS_DM += dmsetup.static - INSTALL_DMSETUP_TARGETS += install_dmsetup_static + install_device-mapper: install_dmsetup_static +endif + +# dmfilemapd support +ifeq ("@BUILD_DMFILEMAPD@", "yes") + SOURCES2 += dmfilemapd.c + TARGETS_DM += dmfilemapd + install_dmfilemapd: install_dmfilemapd_dynamic + + ifeq ("@STATIC_LINK@", "yes") + TARGETS_DM += dmfilemapd.static + install_dmfilemapd: install_dmfilemapd_static + endif endif -CLEAN_TARGETS = $(TARGETS_DM) \ - dmsetup.static \ - $(LDDEPS) .exported_symbols_generated +CLEAN_TARGETS = $(LDDEPS) .exported_symbols_generated \ + dmfilemapd dmfilemapd.static \ + dmsetup dmsetup.static include $(top_builddir)/libdm/make.tmpl CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) +CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS) +LDFLAGS += -L$(interfacebuilddir) +DMLIBS = -ldevmapper dmsetup: dmsetup.o @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o $@ $+ $(LIBS) -L$(top_builddir)/libdm -ldevmapper -lm + -o $@ $+ $(DMLIBS) -dmsetup.static: dmsetup.o $(INTERNAL_LIBS) +dmsetup.static: dmsetup.o @echo " [CC] $@" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ $+ $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) - -all: device-mapper - -.PHONY: install_dmsetup_dynamic install_dmsetup_static + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static \ + -o $@ $+ $(DMLIBS) $(STATIC_LIBS) install_dmsetup_dynamic: dmsetup @echo " [INSTALL] $<" @@ -60,48 +70,29 @@ install_dmsetup_static: dmsetup.static $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) $(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats -install_device-mapper: $(INSTALL_DMSETUP_TARGETS) - -install: install_device-mapper -# dmfilemapd support -ifeq ("@BUILD_DMFILEMAPD@", "yes") - SOURCES += dmfilemapd.c - TARGETS_DM += dmfilemapd - .PHONY: install_dmfilemapd install_dmfilemapd_static - INSTALL_DMFILEMAPD_TARGETS = install_dmfilemapd_dynamic - ifeq ("@STATIC_LINK@", "yes") - TARGETS_DM += dmfilemapd.static - else - TARGETS_DM += dmfilemapd - endif - CLEAN_TARGETS+= dmfilemapd.static - - CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS) - - dmfilemapd: $(LIB_SHARED) dmfilemapd.o - @echo " [CC] $<" +dmfilemapd: $(LIB_SHARED) dmfilemapd.o + @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o $@ dmfilemapd.o -L$(top_builddir)/libdm -ldevmapper $(LIBS) + -o $@ $+ $(DMLIBS) - dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o - @echo " [CC] $<" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ dmfilemapd.o $(LIBS) $(STATIC_LIBS) +dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static \ + -o $@ $+ $(DMLIBS) $(STATIC_LIBS) - install_dmfilemapd_dynamic: dmfilemapd +install_dmfilemapd_dynamic: dmfilemapd @echo " [INSTALL] $<" $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) - install_dmfilemapd_static: dmfilemapd.static +install_dmfilemapd_static: dmfilemapd.static @echo " [INSTALL] $<" $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) - install_dmfilemapd: $(INSTALL_DMFILEMAPD_TARGETS) - install_device-mapper: install_dmfilemapd +.PHONY: install_dmsetup_dynamic install_dmsetup_static +.PHONY: install_dmfilemapd install_dmfilemapd_static - install: install_dmfilemapd -endif +install: install_device-mapper install_dmfilemapd device-mapper: $(TARGETS_DM)

1 0

master - makefiles: allow to set LIBS in Makefiles
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b5366b1d8d9edf8a21de4… Commit: b5366b1d8d9edf8a21de4e256ff89774c6b87f16 Parent: 143c8dcd7f20f6ac07eeb859c5fa8d7fad9a5a44 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Dec 16 15:55:19 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 10:55:19 2018 +0100 makefiles: allow to set LIBS in Makefiles Avoid doing hard set of LIBS var, so if the LIBS is set before 'include make.tmpl' it's not lost. This gives better control over order of linked libraries. --- make.tmpl.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index 56d7cd6..d7b6568 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -61,8 +61,7 @@ PYTHON2 = @PYTHON2@ PYTHON3 = @PYTHON3@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile -LIBS = @LIBS@ -LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm +LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) $(M_LIBS) # Extra libraries always linked with static binaries STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DEFS += @DEFS@

1 0

master - makefiles: no longer used define
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=143c8dcd7f20f6ac07eeb… Commit: 143c8dcd7f20f6ac07eeb859c5fa8d7fad9a5a44 Parent: a66520645395eb2ee19a8a9bc924a5a618330379 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Dec 15 00:20:15 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 10:51:01 2018 +0100 makefiles: no longer used define Not used anymore -D_BUILDING_LVM --- libdm/make.tmpl.in | 2 -- make.tmpl.in | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index cc1642a..92f2f55 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -249,8 +249,6 @@ endif # end of fPIC protection endif -DEFS += -D_BUILDING_LVM - LDFLAGS += -L$(top_builddir)/libdm CLDFLAGS += -L$(top_builddir)/libdm diff --git a/make.tmpl.in b/make.tmpl.in index 13f9afc..56d7cd6 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -267,8 +267,6 @@ endif # end of fPIC protection endif -DEFS += -D_BUILDING_LVM - LDFLAGS += -L$(top_builddir)/lib CLDFLAGS += -L$(top_builddir)/lib

1 0

master - makefiles: missing cleaning
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a66520645395eb2ee19a8… Commit: a66520645395eb2ee19a8a9bc924a5a618330379 Parent: f619cac598e9236dd16c7fd8d3465b981c4a4648 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 17 02:04:11 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 10:36:52 2018 +0100 makefiles: missing cleaning --- scripts/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 6c8546d..ffca04a 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -138,6 +138,7 @@ DISTCLEAN_TARGETS += \ dm_event_systemd_red_hat.service \ dm_event_systemd_red_hat.socket \ lvmdump.sh \ + lvm2-pvscan.service \ lvm2_cluster_activation_red_hat.sh \ lvm2_cluster_activation_systemd_red_hat.service \ lvm2_clvmd_systemd_red_hat.service \

1 0

master - makefiles: quite install
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f619cac598e9236dd16c7… Commit: f619cac598e9236dd16c7fd8d3465b981c4a4648 Parent: a63015442e8bf3893e8531b209057a44158e438b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Dec 15 01:47:24 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 10:36:52 2018 +0100 makefiles: quite install --- conf/Makefile.in | 9 +++++---- scripts/Makefile.in | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/conf/Makefile.in b/conf/Makefile.in index e906835..dc74747 100644 --- a/conf/Makefile.in +++ b/conf/Makefile.in @@ -39,18 +39,19 @@ generate: install_conf: $(CONFSRC) @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \ - $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \ + $(Q) $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \ fi install_localconf: $(CONFLOCAL) @if [ ! -e $(confdir)/$(CONFLOCAL) ]; then \ echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL)"; \ - $(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL); \ + $(Q) $(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL); \ fi install_profiles: $(PROFILES) - $(INSTALL_DIR) $(profiledir) - $(INSTALL_DATA) $(PROFILES) $(profiledir)/ + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(profiledir) + $(Q) $(INSTALL_DATA) $(PROFILES) $(profiledir)/ install_lvm2: install_conf install_localconf install_profiles diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 99acfbc..6c8546d 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -124,8 +124,9 @@ install_systemd_units: install_dbus_service endif install_tmpfiles_configuration: - $(INSTALL_DIR) $(tmpfiles_dir) - $(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(tmpfiles_dir) + $(Q) $(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf DISTCLEAN_TARGETS += \ blkdeactivate.sh \

1 0

master - makefiles: drop unneeded LIBS add
by Zdenek Kabelac 17 Dec '18

17 Dec '18

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a63015442e8bf3893e853… Commit: a63015442e8bf3893e8531b209057a44158e438b Parent: d76b4afb8ed9531c1609804b684900a0ea96815c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 14 23:27:35 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 17 10:36:52 2018 +0100 makefiles: drop unneeded LIBS add --- libdaemon/server/Makefile.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/libdaemon/server/Makefile.in b/libdaemon/server/Makefile.in index e971a52..3a5a220 100644 --- a/libdaemon/server/Makefile.in +++ b/libdaemon/server/Makefile.in @@ -18,5 +18,3 @@ LIB_STATIC = libdaemonserver.a SOURCES = daemon-server.c daemon-log.c include $(top_builddir)/make.tmpl - -LIBS += $(DAEMON_LIBS)

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits December 2018