master - Fix dependecy build for scripts dir
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=286f298bb79a43...
Commit: 286f298bb79a43b61baab36582481df93e84137b
Parent: e309586aebec5ab034c89536620c0b102b8a366c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Aug 1 13:54:32 2012 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Aug 1 13:57:23 2012 +0200
Fix dependecy build for scripts dir
Since now scripts builds binaries, build needs to wait for libs.
---
Makefile.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 04746d1..d957e26 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,6 +56,7 @@ liblvm: lib
daemons: lib libdaemon tools
tools: lib libdaemon device-mapper
po: tools daemons
+scripts: liblvm libdm
lib.device-mapper: include.device-mapper
libdm.device-mapper: include.device-mapper
11 years, 9 months
master - systemd: O_CLOEXEC not needed in activation generator
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e309586aebec5a...
Commit: e309586aebec5ab034c89536620c0b102b8a366c
Parent: c6cc871df845ea4c810122a59606c3c593d15772
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Aug 1 08:57:12 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Aug 1 08:57:12 2012 +0200
systemd: O_CLOEXEC not needed in activation generator
O_CLOEXEC not actually needed, this is just a simple program,
it is not supposed to fork/exec anywhere and anytime in the future.
---
.../lvm2_activation_generator_systemd_red_hat.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
index 9921004..85420b8 100644
--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
+++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
const char *dir;
int r = EXIT_SUCCESS;
- kmsg_fd = open(KMSG_DEV_PATH, O_WRONLY|O_NOCTTY|O_CLOEXEC);
+ kmsg_fd = open(KMSG_DEV_PATH, O_WRONLY|O_NOCTTY);
if (argc > 1 && argc != 4) {
kmsg("LVM: Activation generator takes three or no arguments.\n");
11 years, 9 months
master - make: use proper libs to make scripts subdir
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c6cc871df845ea...
Commit: c6cc871df845ea4c810122a59606c3c593d15772
Parent: fa68466e904568d054f0b0cf5fdab6499cb47998
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Aug 1 08:40:36 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Aug 1 08:42:49 2012 +0200
make: use proper libs to make scripts subdir
---
scripts/Makefile.in | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 40396b0..2298f0c 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -21,8 +21,13 @@ TARGETS = lvm2_activation_generator_systemd_red_hat
include $(top_builddir)/make.tmpl
DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so $(top_builddir)/libdm/libdevmapper.so
+LDFLAGS += -L$(top_builddir)/liblvm
LVMLIBS = @LVM2APP_LIB@ -ldevmapper
+ifeq ("@DMEVENTD@", "yes")
+ LVMLIBS += -ldevmapper-event
+endif
+
SCRIPTS = lvmdump.sh lvmconf.sh vgimportclone.sh
ifeq ("@FSADM@", "yes")
@@ -67,7 +72,7 @@ ifeq ("@BUILD_CMIRRORD@", "yes")
endif
lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS)
- $(CC) -o $@ $(OBJECTS) $(LVMLIBS)
+ $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LVMLIBS)
install_systemd_generators:
$(INSTALL_DIR) $(systemd_generator_dir)
11 years, 9 months
