master - pvscan: move start of polling into vgchange
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=218c57410c32bfa7bf7...
Commit: 218c57410c32bfa7bf7044cc6d94fd9253d6b547
Parent: 752c39d91db55ae637fef3b8066e1a78f894609d
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 21:07:59 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
pvscan: move start of polling into vgchange
Restoring polling for activated volumes lost with my recent commit:
75fed05d3ef648583764ff56cc577e0f3eba1bba and move start of polling
directly into _activate_lvs_in_vg() - as there we know exactly
if there was some volume even activated.
Also make it sharing same code for pvscan -aay.
---
tools/pvscan.c | 10 ----------
tools/vgchange.c | 25 +++++++++++++++++++------
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/tools/pvscan.c b/tools/pvscan.c
index 508f283..61530ee 100644
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -248,16 +248,6 @@ static int _pvscan_autoactivate_single(struct cmd_context *cmd, const char *vg_n
goto out;
}
- /*
- * After sucessfull activation we need to initialise polling
- * for all activated LVs in a VG. Possible enhancement would
- * be adding --poll y|n cmdline option for pvscan and call
- * init_background_polling routine in autoactivation handler.
- */
- log_debug_activation("Starting background polling for VG %s.", vg_name);
-
- if (!(vgchange_background_polling(cmd, vg)))
- goto_out;
out:
return ECMD_PROCESSED;
}
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 55bc476..c513470 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -127,17 +127,29 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg,
sigint_restore();
+ if (expected_count)
+ log_verbose("%sctivated %d logical volumes in volume group %s.",
+ is_change_activating(activate) ? "A" : "Dea",
+ count, vg->name);
+
+ /*
+ * After sucessfull activation we need to initialise polling
+ * for all activated LVs in a VG. Possible enhancement would
+ * be adding --poll y|n cmdline option for pvscan and call
+ * init_background_polling routine in autoactivation handler.
+ */
+ if (count && is_change_activating(activate) &&
+ !vgchange_background_polling(cmd, vg)) {
+ stack;
+ r = 0;
+ }
+
/* Wait until devices are available */
if (!sync_local_dev_names(vg->cmd)) {
log_error("Failed to sync local devices for VG %s.", vg->name);
r = 0;
}
- if (expected_count)
- log_verbose("%s %d logical volumes in volume group %s",
- is_change_activating(activate) ?
- "Activated" : "Deactivated", count, vg->name);
-
return r;
}
@@ -163,7 +175,8 @@ int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg
int polled;
if (background_polling()) {
- polled = _poll_lvs_in_vg(cmd, vg);
+ log_debug_activation("Starting background polling for volume group \"%s\".", vg->name);
+ polled = _poll_lvs_in_vg(cmd, vg);
if (polled)
log_print_unless_silent("Background polling started for %d logical volume(s) "
"in volume group \"%s\"",
6 years
master - pvscan: code reshape
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=752c39d91db55ae637f...
Commit: 752c39d91db55ae637fef3b8066e1a78f894609d
Parent: 33703995ae264c7abdc6d566283d94d8587a85f1
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 21:07:15 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
pvscan: code reshape
---
tools/pvscan.c | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/tools/pvscan.c b/tools/pvscan.c
index 61626e6..508f283 100644
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -318,21 +318,22 @@ static int _pvscan_cache(struct cmd_context *cmd, int argc, char **argv)
dm_list_init(&found_vgnames);
dm_list_init(&pp.changed_vgnames);
- do_activate = arg_is_set(cmd, activate_ARG);
-
- if (!lvmetad_used() && !do_activate) {
- log_verbose("Ignoring pvscan --cache because lvmetad is not in use.");
- return ret;
- }
-
- if (do_activate && (arg_uint_value(cmd, activate_ARG, CHANGE_AAY) != CHANGE_AAY)) {
- log_error("Only --activate ay allowed with pvscan.");
- return 0;
- }
+ if ((do_activate = arg_is_set(cmd, activate_ARG))) {
+ if (arg_uint_value(cmd, activate_ARG, 0) != CHANGE_AAY) {
+ log_error("Only --activate ay allowed with pvscan.");
+ return EINVALID_CMD_LINE;
+ }
- if (!lvmetad_used() && do_activate && !find_config_tree_bool(cmd, global_use_lvmetad_CFG, NULL)) {
- log_verbose("Ignoring pvscan --cache -aay because lvmetad is not in use.");
- return ret;
+ if (!lvmetad_used() &&
+ !find_config_tree_bool(cmd, global_use_lvmetad_CFG, NULL)) {
+ log_verbose("Ignoring pvscan --cache -aay because lvmetad is not in use.");
+ return ret;
+ }
+ } else {
+ if (!lvmetad_used()) {
+ log_verbose("Ignoring pvscan --cache because lvmetad is not in use.");
+ return ret;
+ }
}
if (arg_is_set(cmd, major_ARG) + arg_is_set(cmd, minor_ARG))
6 years
master - vgchange: trace faling activation
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=33703995ae264c7abdc...
Commit: 33703995ae264c7abdc6d566283d94d8587a85f1
Parent: f38a54227d71b6fd661d83609f46459306bc373a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 21:04:53 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
vgchange: trace faling activation
Trace failed activation and directly assign 0 returning failure.
---
tools/vgchange.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 71a6c54..55bc476 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -116,8 +116,11 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg,
expected_count++;
- if (!lv_change_activate(cmd, lv, activate))
+ if (!lv_change_activate(cmd, lv, activate)) {
+ stack;
+ r = 0;
continue;
+ }
count++;
}
@@ -135,7 +138,7 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg,
is_change_activating(activate) ?
"Activated" : "Deactivated", count, vg->name);
- return (expected_count != count) ? 0 : r;
+ return r;
}
static int _vgchange_monitoring(struct cmd_context *cmd, struct volume_group *vg)
6 years
master - vgchange: move active assing
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f38a54227d71b6fd661...
Commit: f38a54227d71b6fd661d83609f46459306bc373a
Parent: 70b159d145dfa960a53f6f61ce735b90ec25b1e0
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 21:00:16 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
vgchange: move active assing
Make eval of activate_ARG reusable.
---
tools/vgchange.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/vgchange.c b/tools/vgchange.c
index b608d87..71a6c54 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -586,6 +586,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
{
int ret = ECMD_PROCESSED;
unsigned i;
+ activation_change_t activate = CHANGE_AN;
static const struct {
int arg;
@@ -642,8 +643,8 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
}
if (arg_is_set(cmd, activate_ARG)) {
- if (!vgchange_activate(cmd, vg, (activation_change_t)
- arg_uint_value(cmd, activate_ARG, CHANGE_AY)))
+ activate = (activation_change_t) arg_uint_value(cmd, activate_ARG, 0);
+ if (!vgchange_activate(cmd, vg, activate))
return_ECMD_FAILED;
}
6 years
master - vgchange: fix error code in error path
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=70b159d145dfa960a53...
Commit: 70b159d145dfa960a53f6f61ce735b90ec25b1e0
Parent: 3eff3aa4f8faa5a84de2ba696b15a976fad31852
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Jun 13 15:57:51 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
vgchange: fix error code in error path
This rather hard to hit error path used wrong return value to signal
real error.
---
tools/vgchange.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 891f22a..b608d87 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -187,7 +187,7 @@ int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg,
strcmp(vg->system_id, cmd->system_id) &&
do_activate) {
log_error("Cannot activate LVs in a foreign VG.");
- return ECMD_FAILED;
+ return 0;
}
/*
6 years
master - device_mapper: drop unneeded function
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3eff3aa4f8faa5a84de...
Commit: 3eff3aa4f8faa5a84de2ba696b15a976fad31852
Parent: 5b515db71ba13d2a4f328be6a97bb309401c5c69
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 20:47:23 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
device_mapper: drop unneeded function
Subdir without stats.
---
device_mapper/ioctl/libdm-iface.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index bec7f0f..733eece 100644
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -624,20 +624,6 @@ static int _dm_inactive_supported(void)
return inactive_supported;
}
-int dm_message_supports_precise_timestamps(void)
-{
- /*
- * 4.32.0 supports "precise_timestamps" and "histogram:" options
- * to @stats_create messages but lacks the ability to report
- * these properties via a subsequent @stats_list: require at
- * least 4.33.0 in order to use these features.
- */
- if (dm_check_version() && _dm_version >= 4)
- if (_dm_version_minor >= 33)
- return 1;
- return 0;
-}
-
void *dm_get_next_target(struct dm_task *dmt, void *next,
uint64_t *start, uint64_t *length,
char **target_type, char **params)
6 years
master - build: better srcdir builddir support
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5b515db71ba13d2a4f3...
Commit: 5b515db71ba13d2a4f328be6a97bb309401c5c69
Parent: 52ab3c1584cd40572e82d6add7a7c71204fa9721
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 20:57:02 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
build: better srcdir builddir support
With the move to top-level makefile - there are some issues
with subdir recursive makefile.
Make the building more tolerant for now until fully resolved.
---
Makefile.in | 3 ++-
test/Makefile.in | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index ae05aea..d076088 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,7 +193,8 @@ endif
endif
-include test/unit/Makefile
+# FIXME: Drop once top-level make is resolved
+-include test/unit/Makefile
include $(top_srcdir)/device_mapper/Makefile
include $(top_srcdir)/base/Makefile
diff --git a/test/Makefile.in b/test/Makefile.in
index 4c3c715..ca2e2e1 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -357,7 +357,7 @@ LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(
touch $@
.lib-dir-stamp:
- $(MKDIR_P) lib
+ $(MKDIR_P) lib unit
for i in $(CMDS); do $(LN_S) -f lvm-wrapper lib/$$i; done
for i in daemons/clvmd/clvmd daemons/dmeventd/dmeventd \
tools/dmsetup daemons/lvmetad/lvmetad \
6 years
master - build: drop libdm referring from lvm code
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=52ab3c1584cd40572e8...
Commit: 52ab3c1584cd40572e82d6add7a7c71204fa9721
Parent: a457566e918840e2f21e724afd1b7f470fcbb02a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 20:48:08 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
build: drop libdm referring from lvm code
Avoid adding /libdm paths into lvm building.
---
make.tmpl.in | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/make.tmpl.in b/make.tmpl.in
index 0790d7b..07cb18a 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -144,7 +144,6 @@ vpath %.po $(srcdir)
vpath %.exported_symbols $(srcdir)
interface = @interface@
-interfacebuilddir = $(top_builddir)/libdm/$(interface)
rpmbuilddir = $(abs_top_builddir)/build
# The number of jobs to run, if blank, defaults to the make standard
@@ -252,18 +251,14 @@ endif
DEFS += -DDEBUG
# memory debugging is not thread-safe yet
ifneq ("@BUILD_DMEVENTD@", "yes")
- ifneq ("@BUILD_DMFILEMAPD@", "yes")
ifneq ("@BUILD_LVMLOCKD@", "yes")
ifneq ("@BUILD_LVMPOLLD@", "yes")
ifneq ("@BUILD_LVMETAD@", "yes")
- ifeq ("@CLVMD@", "none")
DEFS += -DDEBUG_MEM
endif
endif
endif
endif
- endif
- endif
endif
# end of fPIC protection
@@ -271,8 +266,8 @@ endif
DEFS += -D_BUILDING_LVM
-LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
-CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
+LDFLAGS += -L$(top_builddir)/lib
+CLDFLAGS += -L$(top_builddir)/lib
DAEMON_LIBS = -ldaemonclient
LDFLAGS += -L$(top_builddir)/libdaemon/client
@@ -426,8 +421,6 @@ CFLOW_FLAGS +=\
--symbol __REDIRECT:wrapper \
--symbol __REDIRECT_NTH:wrapper \
--symbol __wur:wrapper \
- -I$(top_srcdir)/libdm \
- -I$(top_srcdir)/libdm/ioctl \
-I$(top_srcdir)/daemons/dmeventd/plugins/lvm2/ \
$(INCLUDES) $(DEFS)
6 years
master - build: drop some lvm references from libdm making
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a457566e918840e2f21...
Commit: a457566e918840e2f21e724afd1b7f470fcbb02a
Parent: c6be40960917de0e3baab23ab44c64c682895049
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 20:38:08 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
build: drop some lvm references from libdm making
Some simplification, more may follow...
---
libdm/make.tmpl.in | 55 +++------------------------------------------------
1 files changed, 4 insertions(+), 51 deletions(-)
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index fc29034..1365fd1 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -53,9 +53,6 @@ WC = @WC@
AR = @AR@
RM = rm -f
-PYTHON2 = @PYTHON2@
-PYTHON3 = @PYTHON3@
-PYCOMPILE = $(top_srcdir)/autoconf/py-compile
LIBS = @LIBS@
LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm
@@ -69,9 +66,6 @@ CLDFLAGS += @CLDFLAGS@
ELDFLAGS += @ELDFLAGS@
LDDEPS += @LDDEPS@
LIB_SUFFIX = @LIB_SUFFIX@
-LVMINTERNAL_LIBS=\
- -llvm-internal \
- $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS)
DL_LIBS = @DL_LIBS@
RT_LIBS = @RT_LIBS@
M_LIBS = @M_LIBS@
@@ -250,20 +244,6 @@ ifeq (,$(findstring -g,$(CFLAGS)))
endif
CFLAGS += -fno-omit-frame-pointer
DEFS += -DDEBUG
- # memory debugging is not thread-safe yet
- ifneq ("@BUILD_DMEVENTD@", "yes")
- ifneq ("@BUILD_DMFILEMAPD@", "yes")
- ifneq ("@BUILD_LVMLOCKD@", "yes")
- ifneq ("@BUILD_LVMPOLLD@", "yes")
- ifneq ("@BUILD_LVMETAD@", "yes")
- ifeq ("@CLVMD@", "none")
- DEFS += -DDEBUG_MEM
- endif
- endif
- endif
- endif
- endif
- endif
endif
# end of fPIC protection
@@ -271,18 +251,8 @@ endif
DEFS += -D_BUILDING_LVM
-LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
-CLDFLAGS += -L$(top_builddir)/libdm -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
- CLDFLAGS += -L$(top_builddir)/daemons/dmeventd
-endif
+LDFLAGS += -L$(top_builddir)/libdm
+CLDFLAGS += -L$(top_builddir)/libdm
# Combination of DEBUG_POOL and DEBUG_ENFORCE_POOL_LOCKING is not suppored.
#DEFS += -DDEBUG_POOL
@@ -307,8 +277,6 @@ LIB_VERSION_LVM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir
LIB_VERSION_DM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir)/VERSION_DM)
-LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_srcdir)/VERSION)
-
INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include
@@ -319,22 +287,19 @@ OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
POTFILES = $(SOURCES:%.c=%.pot)
.PHONY: all pofile distclean clean cleandir cflow device-mapper
-.PHONY: install install_cluster install_device-mapper install_lvm2
+.PHONY: install install_device-mapper install_lvm2
.PHONY: install_dbus_service
.PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin
.PHONY: install_ocf install_systemd_generators install_all_man all_man man help
.PHONY: python_bindings install_python_bindings
.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
-.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
+.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.cflow)
.PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
.PHONY: $(SUBDIRS.generate) generate
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.install_ocf := $(SUBDIRS:=.install_ocf)
SUBDIRS.pofile := $(SUBDIRS:=.pofile)
SUBDIRS.cflow := $(SUBDIRS:=.cflow)
SUBDIRS.clean := $(SUBDIRS:=.clean)
@@ -345,10 +310,7 @@ TARGETS += $(LIB_SHARED) $(LIB_STATIC)
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)
-install_ocf: $(SUBDIRS.install_ocf)
cflow: $(SUBDIRS.cflow)
$(SUBDIRS): $(SUBDIRS.device-mapper)
@@ -360,18 +322,9 @@ $(SUBDIRS.device-mapper):
$(SUBDIRS.install): $(SUBDIRS)
$(MAKE) -C $(@:.install=) install
-$(SUBDIRS.install_cluster): $(SUBDIRS)
- $(MAKE) -C $(@:.install_cluster=) install_cluster
-
$(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.install_ocf):
- $(MAKE) -C $(@:.install_ocf=) install_ocf
-
$(SUBDIRS.clean):
-$(MAKE) -C $(@:.clean=) clean
6 years
master - build: ensure libdm is built before dm-tools
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c6be40960917de0e3ba...
Commit: c6be40960917de0e3baab23ab44c64c682895049
Parent: 327f62a25533c195f4b49a29974f3c5a2f93c15b
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Jun 14 20:37:33 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Jun 14 22:02:01 2018 +0200
build: ensure libdm is built before dm-tools
Making libs before entering dm-tools subdir,
so the tool will not link i.e. system library if present.
---
libdm/Makefile.in | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 6472da7..8c8334a 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -62,6 +62,8 @@ LIBS += $(RT_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) $(M_LIBS)
device-mapper: all
+dm-tools.device-mapper: $(TARGETS)
+
libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION): $(LIB_SHARED)
$(LN_S) -f $< $@
6 years