New patch submitted by Federico Simoncelli (fsimonce(a)redhat.com)
You can review this change at:
http://gerrit.usersys.redhat.com/703
commit fb6abc91130e3915453f265f83ef6921f4e15c40
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Wed Jul 13 14:14:09 2011 +0000
[WIP] Replace 'cp' and 'mkdir' with $(INSTALL)
Change-Id: Ib5e6215c30a3feb80e60e4feaff1d5280f7d1d08
diff --git a/vds_bootstrap/Makefile b/vds_bootstrap/Makefile
index 76bf525..6ba23bc 100644
--- a/vds_bootstrap/Makefile
+++ b/vds_bootstrap/Makefile
@@ -6,14 +6,16 @@
# LICENSE_GPL_v2 which accompany this distribution.
#
+INSTALL = install
TARGET = /usr/share/vdsm-bootstrap
-PYSRCS = vds_bootstrap.py deployUtil.py vds_bootstrap_complete.py
+PYSRCS = vds_bootstrap.py vds_bootstrap_complete.py
all: $(PYSRCS)
install:
- mkdir -p $(DESTDIR)/$(TARGET)
- cp $(PYSRCS) $(DESTDIR)/$(TARGET)
+ $(INSTALL) -Dd 755 $(DESTDIR)$(TARGET)
+ $(INSTALL) -Dm 755 $(PYSRCS) $(DESTDIR)$(TARGET)
+ $(INSTALL) -Dm 644 deployUtil.py $(DESTDIR)$(TARGET)
clean:
$(RM) *.pyc *.pyo *~
diff --git a/vdsm.spec.in b/vdsm.spec.in
index e6af2dc..e57ead5 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -64,7 +64,10 @@ make -C vdsm DESTDIR="%{buildroot}" \
VDSMLIBDIR=%{_localstatedir}/lib/%{vdsm_name} \
SOSPLUGINDIR=%{py_sitedir}/sos/plugins \
install
-mkdir -p "%{buildroot}"%{_localstatedir}/log/core
+
+# this is not commonplace, but we want /var/log/core to be a world-writable
+# dropbox for core dumps.
+install -dDm 1777 "%{buildroot}"%{_localstatedir}/log/core
# hook vhostmd
make -C vdsm/hooks/vhostmd DESTDIR="%{buildroot}" \
@@ -265,27 +268,27 @@ machines without running real guests.
%{_datadir}/%{vdsm_name}/hooks.py*
%{_datadir}/%{vdsm_name}/hooking.py*
%{_datadir}/%{vdsm_name}/libvirtev.py*
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/vdsm
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/vdsm-restore-net-config
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/vdsm-store-net-config
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/write-net-config
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/mk_sysprep_floppy
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/get-vm-pid
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/prepare-vmchannel
+%{_datadir}/%{vdsm_name}/vdsm
+%{_datadir}/%{vdsm_name}/vdsm-restore-net-config
+%{_datadir}/%{vdsm_name}/vdsm-store-net-config
+%{_datadir}/%{vdsm_name}/write-net-config
+%{_datadir}/%{vdsm_name}/mk_sysprep_floppy
+%{_datadir}/%{vdsm_name}/get-vm-pid
+%{_datadir}/%{vdsm_name}/prepare-vmchannel
%doc vdsm/vdsm.conf.sample
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
%config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
-%attr (440,root,root) %{_sysconfdir}/sudoers.d/50_vdsm
+%{_sysconfdir}/sudoers.d/50_vdsm
%{_sysconfdir}/cron.hourly/vdsm-logrotate
%{_datadir}/%{vdsm_name}/guestIF.py*
%{_datadir}/%{vdsm_name}/logUtils.py*
%{_datadir}/%{vdsm_name}/dsaversion.py*
%{_datadir}/%{vdsm_name}/pthread.py*
%{_datadir}/%{vdsm_name}/betterThreading.py*
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/logCollector.sh
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
+%{_datadir}/%{vdsm_name}/logCollector.sh
+%{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
+%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
%{_datadir}/%{vdsm_name}/storage/__init__.py*
%{_datadir}/%{vdsm_name}/storage/dispatcher.py*
%{_datadir}/%{vdsm_name}/storage/storage_exception.py*
@@ -323,9 +326,9 @@ machines without running real guests.
%{_datadir}/%{vdsm_name}/storage/sdc.py*
%{_datadir}/%{vdsm_name}/storage/sdf.py*
%{_datadir}/%{vdsm_name}/storage/persistentDict.py*
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/safelease
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/spmprotect.sh
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/spmstop.sh
+%{_libexecdir}/%{vdsm_name}/safelease
+%{_libexecdir}/%{vdsm_name}/spmprotect.sh
+%{_libexecdir}/%{vdsm_name}/spmstop.sh
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_start
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_cont
@@ -343,46 +346,49 @@ machines without running real guests.
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_vdsm_start
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/configNetwork.py*
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/addNetwork
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/delNetwork
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/respawn
+%{_datadir}/%{vdsm_name}/configNetwork.py*
+%{_datadir}/%{vdsm_name}/addNetwork
+%{_datadir}/%{vdsm_name}/delNetwork
+%{_datadir}/%{vdsm_name}/respawn
%{_datadir}/%{vdsm_name}/SecureXMLRPCServer.py*
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/get-conf-item
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/set-conf-item
+%{_datadir}/%{vdsm_name}/get-conf-item
+%{_datadir}/%{vdsm_name}/set-conf-item
%{_datadir}/%{vdsm_name}/kaxmlrpclib.py*
%{_datadir}/%{vdsm_name}/config.py*
%{_datadir}/%{vdsm_name}/ksm.py*
%{_datadir}/%{vdsm_name}/netinfo.py*
%{_datadir}/%{vdsm_name}/neterrors.py*
-%attr (755,root,root) %{_datadir}/%{vdsm_name}/img_verifier
+%{_datadir}/%{vdsm_name}/img_verifier
%{_sysconfdir}/udev/rules.d/12-vdsm-lvm.rules
-# this is not commonplace, but we want /var/log/core to be a world-writable
-# dropbox for core dumps.
-%dir %attr (1777,root,root) %{_localstatedir}/log/core
-%dir %attr (755,vdsm,kvm) %{_localstatedir}/lib/%{vdsm_name}
-%dir %attr (755,vdsm,kvm) %{_localstatedir}/lib/%{vdsm_name}/netconfback
-%dir %attr (755,vdsm,kvm) %{_localstatedir}/run/%{vdsm_name}
-%dir %attr (755,vdsm,kvm) %{_localstatedir}/run/%{vdsm_name}/pools
-%dir %attr (755,vdsm,kvm) %{_localstatedir}/log/%{vdsm_name}
-%dir %attr (755,vdsm,kvm) %{_localstatedir}/log/%{vdsm_name}/backup
-%dir %attr (755,vdsm,kvm) %{_sysconfdir}/pki/%{vdsm_name}
-%dir %attr (755,vdsm,kvm) %{_sysconfdir}/pki/%{vdsm_name}/keys
-%dir %attr (755,vdsm,kvm) %{_sysconfdir}/pki/%{vdsm_name}/certs
+%dir %{_localstatedir}/log/core
+
/etc/init.d/vdsmd
%doc LICENSE_GPL_v2 README
%{py_sitedir}/sos/plugins/vdsm.py*
-%dir %attr (775,vdsm,qemu) %{_localstatedir}/lib/libvirt/qemu/channels/
%{_mandir}/man8/vdsmd.8*
+%defattr(-, vdsm, qemu, -)
+%dir %{_localstatedir}/lib/libvirt/qemu/channels
+
+%defattr(-, vdsm, kvm, -)
+%dir %{_sysconfdir}/pki/%{vdsm_name}
+%dir %{_sysconfdir}/pki/%{vdsm_name}/keys
+%dir %{_sysconfdir}/pki/%{vdsm_name}/certs
+%dir %{_localstatedir}/lib/%{vdsm_name}
+%dir %{_localstatedir}/lib/%{vdsm_name}/netconfback
+%dir %{_localstatedir}/run/%{vdsm_name}
+%dir %{_localstatedir}/run/%{vdsm_name}/pools
+%dir %{_localstatedir}/log/%{vdsm_name}
+%dir %{_localstatedir}/log/%{vdsm_name}/backup
+
%files hook-vhostmd
%defattr(-,root,root,-)
%doc LICENSE_GPL_v2
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vhostmd
-%attr (755,root,root)
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vhostmd
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_dehibernate/50_vhostmd
-%attr (755,root,root) %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_vhostmd
-%attr (440,root,root) %{_sysconfdir}/sudoers.d/50_vdsm_hook_vhostmd
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vhostmd
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vhostmd
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_dehibernate/50_vhostmd
+%{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_vhostmd
+%{_sysconfdir}/sudoers.d/50_vdsm_hook_vhostmd
%files debug-plugin
%defattr(-,root,root,-)
@@ -395,13 +401,12 @@ machines without running real guests.
%{_sysconfdir}/bash_completion.d/vdsClient
%{_datadir}/%{vdsm_name}/vdscli.py*
%{_datadir}/%{vdsm_name}/dumpStorageTable.py*
-%attr (755,root,root) %{_bindir}/vdsClient
+%{_bindir}/vdsClient
%{_mandir}/man1/vdsClient.1*
%files bootstrap
%defattr(-,root,root,-)
%doc LICENSE_GPL_v2
-%dir %{_datadir}/%{vdsm_bootstrap}
%{_datadir}/%{vdsm_bootstrap}/vds_bootstrap.py*
%{_datadir}/%{vdsm_bootstrap}/deployUtil.py*
%{_datadir}/%{vdsm_bootstrap}/vds_bootstrap_complete.py*
@@ -410,9 +415,8 @@ machines without running real guests.
%files reg
%defattr(-,root,root,-)
%doc LICENSE_GPL_v2
-%dir %{_sysconfdir}/%{vdsm_reg}
-%dir %{_datadir}/%{vdsm_reg}
-%dir %attr (755,vdsm,kvm) %{_var}/log/%{vdsm_reg}
+%dir %{_sysconfdir}/%{vdsm_reg}
+%dir %{_datadir}/%{vdsm_reg}
%config(noreplace) %{_sysconfdir}/%{vdsm_reg}/vdsm-reg.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_reg}/logger.conf
%{_sysconfdir}/init.d/vdsm-reg
@@ -425,13 +429,15 @@ machines without running real guests.
%{_datadir}/%{vdsm_reg}/deployUtil.py*
%{_datadir}/%{vdsm_reg}/createDaemon.py*
%{py_sitedir}/ovirt_config_setup/rhevm.py*
-%attr (755,root,root) %{_datadir}/%{vdsm_reg}/config-rhev-manager
-%attr (755,root,root) %{_datadir}/%{vdsm_reg}/save-config
+%{_datadir}/%{vdsm_reg}/config-rhev-manager
+%{_datadir}/%{vdsm_reg}/save-config
%{_sysconfdir}/ovirt-config-setup.d
%{_sysconfdir}/ovirt-config-boot.d/vdsm-config
%config(noreplace) %{_sysconfdir}/logrotate.d/vdsm-reg
%{_sysconfdir}/cron.hourly/vdsm-reg-logrotate
%{_mandir}/man8/vdsm-reg.8*
+%defattr(-, vdsm, kvm,-)
+%dir %{_var}/log/%{vdsm_reg}
%files hook-faqemu
%defattr(-,root,root,-)
diff --git a/vdsm/Makefile b/vdsm/Makefile
index 71d6859..ef4137f 100644
--- a/vdsm/Makefile
+++ b/vdsm/Makefile
@@ -5,6 +5,9 @@
# (at your option) any later version. See the files README and
# LICENSE_GPL_v2 which accompany this distribution.
#
+
+INSTALL=install
+
FILES=define.py utils.py constants.py \
vm.py libvirtvm.py libvirtev.py \
caps.py clientIF.py \
@@ -93,45 +96,37 @@ HOOKS=before_vm_start after_vm_start before_vm_cont after_vm_cont \
before_vdsm_start after_vdsm_stop
install: all sudoers.vdsm vdsm.conf.sample
- mkdir -p $(DESTDIR)$(VDSMDIR)
- mkdir -p $(DESTDIR)$(VDSMDIR)/storage
- mkdir -p $(DESTDIR)$(TRUSTSTORE)/{certs,keys}
- mkdir -p $(DESTDIR)$(VDSMLOGDIR)
- mkdir -p $(DESTDIR)$(VDSMRUNDIR)
- mkdir -p $(DESTDIR)$(VDSMLIBDIR)
- mkdir -p $(DESTDIR)$(VDSMLIBDIR)/netconfback
- mkdir -p $(DESTDIR)$(POOLSDATADIR)
- mkdir -p $(DESTDIR)$(BACKUPDIR)
- mkdir -p $(DESTDIR)$(BINDIR)
- mkdir -p $(DESTDIR)$(LIBEXECDIR)
- (for hook in $(HOOKS); do mkdir -p $(DESTDIR)$(LIBEXECDIR)/hooks/$$hook; done)
- mkdir -p $(DESTDIR)$(CONFDIR)
- mkdir -p $(DESTDIR)$(POOLDATADIR)
- mkdir -p $(DESTDIR)$(BACKUPDATADIR)
- mkdir -p $(DESTDIR)/etc/init.d/
- mkdir -p $(DESTDIR)/etc/udev/rules.d/
- mkdir -p $(DESTDIR)/var/lib/libvirt/qemu/channels/
- cp $(FILES) $(DESTDIR)$(VDSMDIR)
- cp $(SCRIPTFILES) $(DESTDIR)$(VDSMDIR)
- (cd storage; cp $(STORAGEFILES) $(DESTDIR)$(VDSMDIR)/storage)
- (cd storage; cp 12-vdsm-lvm.rules $(DESTDIR)$(UDEVDIR))
- cp logger.conf $(DESTDIR)$(CONFDIR)
- cp vdsmd $(DESTDIR)/etc/init.d/vdsmd
- (cd storage/protect; cp $(PROTECTFILES) $(DESTDIR)$(LIBEXECDIR))
- mkdir -p $(DESTDIR)/etc/sudoers.d/
- cp sudoers.vdsm $(DESTDIR)/etc/sudoers.d/50_vdsm
- mkdir -p $(DESTDIR)/etc/logrotate.d
- mkdir -p $(DESTDIR)/etc/cron.hourly
- mkdir -p $(DESTDIR)$(SOSPLUGINDIR)
- cp -p vdsm-logrotate.conf $(DESTDIR)/etc/logrotate.d/vdsm
- cp -p vdsm-logrotate $(DESTDIR)/etc/cron.hourly
- cp -p vdsm-sosplugin.py $(DESTDIR)$(SOSPLUGINDIR)/vdsm.py
- mkdir -p $(DESTDIR)$(MANDIR)/man8
- cp -p vdsmd.8 $(DESTDIR)$(MANDIR)/man8/
- mkdir -p $(DESTDIR)/etc/rwtab.d/
- cp -p vdsm.rwtab $(DESTDIR)/etc/rwtab.d/vdsm
- cp -p hooks/persist-vdsm-hooks $(DESTDIR)$(LIBEXECDIR)
- cp -p hooks/unpersist-vdsm-hook $(DESTDIR)$(LIBEXECDIR)
+ $(INSTALL) -Dd $(DESTDIR)$(VDSMDIR)/storage/protect
+ $(INSTALL) -Dd $(DESTDIR)$(TRUSTSTORE)/{certs,keys}
+ $(INSTALL) -Dd $(DESTDIR)$(VDSMLOGDIR)
+ $(INSTALL) -Dd $(DESTDIR)$(VDSMRUNDIR)
+ $(INSTALL) -Dd $(DESTDIR)$(VDSMLIBDIR)/netconfback
+ $(INSTALL) -Dd $(DESTDIR)$(POOLSDATADIR)
+ $(INSTALL) -Dd $(DESTDIR)$(BACKUPDIR)
+ $(INSTALL) -Dd $(DESTDIR)$(POOLDATADIR)
+ $(INSTALL) -Dd $(DESTDIR)/etc/init.d
+ $(INSTALL) -Dd $(DESTDIR)/etc/udev/rules.d
+ $(INSTALL) -Dd -m 775 $(DESTDIR)/var/lib/libvirt/qemu/channels
+ (for hook in $(HOOKS); do \
+ $(INSTALL) -Dd $(DESTDIR)$(LIBEXECDIR)/hooks/$$hook; \
+ done)
+ $(INSTALL) -Dm 644 $(FILES) $(DESTDIR)$(VDSMDIR)
+ $(INSTALL) -Dm 755 $(SCRIPTFILES) $(DESTDIR)$(VDSMDIR)
+ (cd storage; \
+ $(INSTALL) -Dm 644 $(STORAGEFILES) $(DESTDIR)$(VDSMDIR)/storage)
+ (cd storage/protect; \
+ $(INSTALL) -Dm 755 $(PROTECTFILES) $(DESTDIR)$(LIBEXECDIR))
+ $(INSTALL) -Dm 644 storage/12-vdsm-lvm.rules $(DESTDIR)$(UDEVDIR)
+ $(INSTALL) -Dm 644 logger.conf $(DESTDIR)$(CONFDIR)/logger.conf
+ $(INSTALL) -Dm 755 vdsmd $(DESTDIR)/etc/init.d/vdsmd
+ $(INSTALL) -Dm 440 sudoers.vdsm $(DESTDIR)/etc/sudoers.d/50_vdsm
+ $(INSTALL) -Dm 644 vdsm-logrotate.conf $(DESTDIR)/etc/logrotate.d/vdsm
+ $(INSTALL) -Dm 755 vdsm-logrotate $(DESTDIR)/etc/cron.hourly/vdsm-logrotate
+ $(INSTALL) -Dm 644 vdsm-sosplugin.py $(DESTDIR)$(SOSPLUGINDIR)/vdsm.py
+ $(INSTALL) -Dm 644 vdsmd.8 $(DESTDIR)$(MANDIR)/man8/vdsmd.8
+ $(INSTALL) -Dm 644 vdsm.rwtab $(DESTDIR)/etc/rwtab.d/vdsm
+ $(INSTALL) -Dm 755 hooks/persist-vdsm-hooks $(DESTDIR)$(LIBEXECDIR)/persist-vdsm-hooks
+ $(INSTALL) -Dm 755 hooks/unpersist-vdsm-hook
$(DESTDIR)$(LIBEXECDIR)/unpersist-vdsm-hook
clean:
$(RM) *~ *.pyc storage/protect/safelease vdsm.conf.sample
diff --git a/vdsm/hooks/faqemu/Makefile b/vdsm/hooks/faqemu/Makefile
index 00ee2f5..0ec2515 100644
--- a/vdsm/hooks/faqemu/Makefile
+++ b/vdsm/hooks/faqemu/Makefile
@@ -1,13 +1,13 @@
+INSTALL=install
+LN_S=ln -s
BINDIR=/usr/bin
LIBEXECDIR=/usr/libexec/vdsm
HOOKSDIR=$(LIBEXECDIR)/hooks
install:
- install -d $(DESTDIR)$(BINDIR)
- install -m 755 qemu $(DESTDIR)$(BINDIR)
- ln -sf qemu $(DESTDIR)$(BINDIR)/qemu-system-x86_64
- install -d $(DESTDIR)$(HOOKSDIR)/before_vm_start
- install -m 755 before_vm_start.py $(DESTDIR)$(HOOKSDIR)/before_vm_start/10_faqemu
+ $(INSTALL) -Dm 755 qemu $(DESTDIR)$(BINDIR)/qemu
+ $(LN_S) qemu $(DESTDIR)$(BINDIR)/qemu-system-x86_64
+ $(INSTALL) -Dm 755 before_vm_start.py $(DESTDIR)$(HOOKSDIR)/before_vm_start/10_faqemu
clean:
$(RM) *~ *.pyc
diff --git a/vdsm/hooks/vhostmd/Makefile b/vdsm/hooks/vhostmd/Makefile
index 2efc7ce..6f13033 100644
--- a/vdsm/hooks/vhostmd/Makefile
+++ b/vdsm/hooks/vhostmd/Makefile
@@ -1,16 +1,16 @@
+INSTALL=install
+LN_S=ln -s
LIBEXECDIR=/usr/libexec/vdsm
HOOKSDIR=$(LIBEXECDIR)/hooks
all:
install:
- mkdir -p $(DESTDIR)$(HOOKSDIR)/{before_vm_start,after_vm_destroy}
- cp before_vm_start.py $(DESTDIR)$(HOOKSDIR)/before_vm_start/50_vhostmd
- ln -s ../before_vm_start/50_vhostmd
$(DESTDIR)$(HOOKSDIR)/before_vm_migrate_destination/50_vhostmd
- ln -s ../before_vm_start/50_vhostmd
$(DESTDIR)$(HOOKSDIR)/before_vm_dehibernate/50_vhostmd
- cp after_vm_destroy.py $(DESTDIR)$(HOOKSDIR)/after_vm_destroy/50_vhostmd
- mkdir -p $(DESTDIR)/etc/sudoers.d/
- cp sudoers.vdsm_hook_vhostmd $(DESTDIR)/etc/sudoers.d/50_vdsm_hook_vhostmd
+ $(INSTALL) -Dm 755 before_vm_start.py $(DESTDIR)$(HOOKSDIR)/before_vm_start/50_vhostmd
+ $(LN_S) ../before_vm_start/50_vhostmd
$(DESTDIR)$(HOOKSDIR)/before_vm_migrate_destination/50_vhostmd
+ $(LN_S) ../before_vm_start/50_vhostmd
$(DESTDIR)$(HOOKSDIR)/before_vm_dehibernate/50_vhostmd
+ $(INSTALL) -Dm 755 after_vm_destroy.py
$(DESTDIR)$(HOOKSDIR)/after_vm_destroy/50_vhostmd
+ $(INSTALL) -Dm 440 sudoers.vdsm_hook_vhostmd
$(DESTDIR)/etc/sudoers.d/50_vdsm_hook_vhostmd
clean:
$(RM) *~ *.pyc
diff --git a/vdsm_cli/Makefile b/vdsm_cli/Makefile
index 65b22cc..f135d27 100644
--- a/vdsm_cli/Makefile
+++ b/vdsm_cli/Makefile
@@ -5,6 +5,9 @@
# (at your option) any later version. See the files README and
# LICENSE_GPL_v2 which accompany this distribution.
#
+
+INSTALL = install
+
TARGET = /usr/share/vdsm
PYSRCS = vdsClient.py vdscli.py dumpStorageTable.py
CONFDIR = /etc/vdsm
@@ -21,14 +24,11 @@ fixpaths:
sed -i "s:@TRUSTSTORE@:$(TRUSTSTORE):" vdscli.py
install: fixpaths
- mkdir -p $(DESTDIR)/$(TARGET)
- cp $(PYSRCS) $(DESTDIR)/$(TARGET)
- mkdir -p $(DESTDIR)/$(BINDIR)
- cp vdsClient $(DESTDIR)/$(BINDIR)
- mkdir -p $(DESTDIR)/$(COMPDIR)
- cp vdsClient.completion $(DESTDIR)$(COMPDIR)/vdsClient
- mkdir -p $(DESTDIR)$(MANDIR)/man1
- cp vdsClient.1 $(DESTDIR)$(MANDIR)/man1/
+ $(INSTALL) -Dd $(DESTDIR)/$(TARGET)
+ $(INSTALL) -Dm 644 $(PYSRCS) $(DESTDIR)/$(TARGET)
+ $(INSTALL) -Dm 755 vdsClient $(DESTDIR)/$(BINDIR)/vdsClient
+ $(INSTALL) -Dm 644 vdsClient.completion $(DESTDIR)$(COMPDIR)/vdsClient
+ $(INSTALL) -Dm 644 vdsClient.1 $(DESTDIR)$(MANDIR)/man1/vdsClient.1
clean:
$(RM) *~ *.pyc
diff --git a/vdsm_reg/Makefile b/vdsm_reg/Makefile
index bf33db8..5e1cdc0 100644
--- a/vdsm_reg/Makefile
+++ b/vdsm_reg/Makefile
@@ -1,3 +1,5 @@
+INSTALL=install
+LN_S=ln -s
VDSMREGDIR=/usr/share/vdsm-reg
ETC=/etc
CONFDIR=$(ETC)/vdsm-reg
@@ -5,6 +7,8 @@ LOGDIR=/var/log/vdsm-reg
VDSMRUNDIR=/var/run/vdsm
MANDIR=/usr/share/man
+FILES=define.py config.py deployUtil.py createDaemon.py
+
all:
@echo only \"make install\" is available
@false
@@ -13,24 +17,25 @@ fixpaths:
sed -i "s:@VDSMRUNDIR@:$(VDSMRUNDIR):" vdsm-reg.conf
install: fixpaths
- mkdir -p $(DESTDIR)$(CONFDIR)
- mkdir -p $(DESTDIR)$(VDSMREGDIR)
- mkdir -p $(DESTDIR)$(ETC)/ovirt-config-setup.d/
- mkdir -p $(DESTDIR)$(ETC)/ovirt-config-boot.d/
- mkdir -p $(DESTDIR)$(LOGDIR)
- mkdir -p $(DESTDIR)$(OVIRT_CONFIG_SETUP)
-
- cp -p vdsm-reg $(DESTDIR)$(ETC)/init.d
- cp -p {logger.conf,vdsm-reg.conf} $(DESTDIR)$(CONFDIR)
- cp -p define.py config.py config-rhev-manager save-config deployUtil.py createDaemon.py
$(DESTDIR)$(VDSMREGDIR)
- cp -p vdsm-reg-setup.py $(DESTDIR)$(VDSMREGDIR)/vdsm-reg-setup
- cp -p vdsm-gen-cert.py $(DESTDIR)$(VDSMREGDIR)/vdsm-gen-cert
- cp -p vdsm-complete.py $(DESTDIR)$(VDSMREGDIR)/vdsm-complete
- cp -p vdsm-upgrade.py $(DESTDIR)$(VDSMREGDIR)/vdsm-upgrade
- ln -s $(VDSMREGDIR)/config-rhev-manager
$(DESTDIR)$(ETC)/ovirt-config-setup.d/"40_Configure the host for RHEV"
- cp -p vdsm-config $(DESTDIR)$(ETC)/ovirt-config-boot.d
- cp -p vdsm-reg-logrotate.conf $(DESTDIR)$(ETC)/logrotate.d/vdsm-reg
- cp -p vdsm-reg-logrotate $(DESTDIR)$(ETC)/cron.hourly
- mkdir -p $(DESTDIR)$(MANDIR)/man8
- cp -p vdsm-reg.8 $(DESTDIR)$(MANDIR)/man8/
- cp -p rhevm.py $(DESTDIR)$(OVIRT_CONFIG_SETUP)
+ $(INSTALL) -Dd $(DESTDIR)$(CONFDIR)
+ $(INSTALL) -Dd $(DESTDIR)$(VDSMREGDIR)
+ $(INSTALL) -Dd $(DESTDIR)$(LOGDIR)
+ $(INSTALL) -Dd $(DESTDIR)$(OVIRT_CONFIG_SETUP)
+ $(INSTALL) -Dm 755 vdsm-reg $(DESTDIR)$(ETC)/init.d/vdsm-reg
+ $(INSTALL) -Dm 644 logger.conf $(DESTDIR)$(CONFDIR)/logger.conf
+ $(INSTALL) -Dm 644 vdsm-reg.conf $(DESTDIR)$(CONFDIR)/vdsm-reg.conf
+ $(INSTALL) -Dm 644 $(FILES) $(DESTDIR)$(VDSMREGDIR)
+ $(INSTALL) -Dm 755 save-config $(DESTDIR)$(VDSMREGDIR)
+ $(INSTALL) -Dm 755 config-rhev-manager $(DESTDIR)$(VDSMREGDIR)
+ $(INSTALL) -Dm 755 vdsm-reg-setup.py $(DESTDIR)$(VDSMREGDIR)/vdsm-reg-setup
+ $(INSTALL) -Dm 755 vdsm-gen-cert.py $(DESTDIR)$(VDSMREGDIR)/vdsm-gen-cert
+ $(INSTALL) -Dm 755 vdsm-complete.py $(DESTDIR)$(VDSMREGDIR)/vdsm-complete
+ $(INSTALL) -Dm 755 vdsm-upgrade.py $(DESTDIR)$(VDSMREGDIR)/vdsm-upgrade
+ $(INSTALL) -Dd $(DESTDIR)$(ETC)/ovirt-config-setup.d
+ $(LN_S) $(VDSMREGDIR)/config-rhev-manager \
+ "$(DESTDIR)$(ETC)/ovirt-config-setup.d/40_Configure the host for
RHEV"
+ $(INSTALL) -Dm 755 vdsm-config $(DESTDIR)$(ETC)/ovirt-config-boot.d/vdsm-config
+ $(INSTALL) -Dm 644 vdsm-reg-logrotate.conf $(DESTDIR)$(ETC)/logrotate.d/vdsm-reg
+ $(INSTALL) -Dm 755 vdsm-reg-logrotate $(DESTDIR)$(ETC)/cron.hourly
+ $(INSTALL) -Dm 644 vdsm-reg.8 $(DESTDIR)$(MANDIR)/man8/vdsm-reg.8
+ $(INSTALL) -Dm 644 rhevm.py $(DESTDIR)$(OVIRT_CONFIG_SETUP)