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

makefiles: install lvmdbusd executable

Use a different mechanism to ensure, lvmdbudd is executable at
install destination.
This commit is contained in:
Zdenek Kabelac 2023-07-13 16:36:49 +02:00
parent f8712c6cab
commit 7171260b94
3 changed files with 2 additions and 6 deletions

View File

@ -51,18 +51,14 @@ include $(top_builddir)/make.tmpl
.PHONY: install_lvmdbusd .PHONY: install_lvmdbusd
all:
$(Q) test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD)
install_lvmdbusd: $(LVMDBUSD) install_lvmdbusd: $(LVMDBUSD)
@echo " [INSTALL] $<" @echo " [INSTALL] $<"
$(Q) $(INSTALL_DIR) $(sbindir) $(Q) $(INSTALL_DIR) $(sbindir)
$(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
$(Q) $(INSTALL_DIR) $(lvmdbusdir) $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__
$(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir)) $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir))
$(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir) $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir)
$(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbuspydir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) $(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbuspydir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES)
$(Q) $(CHMOD) 755 $(lvmdbusdir)/__pycache__
$(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co] $(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co]
install_lvm2: install_lvmdbusd install_lvm2: install_lvmdbusd

0
daemons/lvmdbusd/lvm_shell_proxy.py.in Executable file → Normal file
View File

View File

@ -203,7 +203,7 @@ endif
# Handle installation of files # Handle installation of files
ifeq ("@WRITE_INSTALL@", "yes") ifeq ("@WRITE_INSTALL@", "yes")
# leaving defaults # leaving defaults
M_INSTALL_SCRIPT = M_INSTALL_SCRIPT = -m 755
M_INSTALL_DATA = -m 644 M_INSTALL_DATA = -m 644
else else
M_INSTALL_PROGRAM = -m 555 M_INSTALL_PROGRAM = -m 555