Jarod.w has uploaded a new change for review. Change subject: Let enable-hooks controll all hook packages ......................................................................
Let enable-hooks controll all hook packages If we don't add --enable-hooks when configuring the package, it still builds hook rpm packages(vdsm-hook-faqemu, vdsm-hook-vhostmd, vdsm-hook-qemucmdline). It seems abnormal. The patch can let enable-hooks controll all hook packages, and it doesn't build any hook packages when we don't add this configuration. Change-Id: I552d6da620a200a051c22c43aa1697664e8ad131 Signed-off-by: jarod.w <[email protected]> --- M vdsm.spec.in M vdsm_hooks/Makefile.am 2 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/7978/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 56a42b4..3c051e9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -738,6 +738,7 @@ %{_datadir}/%{vdsm_name}/tests/tc_filter_show.out %{_datadir}/%{vdsm_name}/tests/functional/*.py* +%if 0%{?with_hooks} %files hook-vhostmd %defattr(-, root, root, -) %doc COPYING @@ -752,7 +753,6 @@ %doc COPYING %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_qemucmdline -%if 0%{?with_hooks} %files hook-directlun %defattr(-, vdsm, kvm, -) %attr (440,root,root) %{_sysconfdir}/sudoers.d/50_vdsm_hook_directlun @@ -827,6 +827,12 @@ %attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_sriov %attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_source/50_sriov +%files hook-faqemu +%defattr(-, root, root, -) +%doc COPYING +%{_libexecdir}/%{vdsm_name}/vdsm-faqemu +%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu + %files hook-vmdisk %defattr(-, vdsm, kvm, -) %attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmdisk @@ -899,12 +905,6 @@ %defattr(-, %{vdsm_user}, %{vdsm_group},-) %dir %{_var}/log/%{vdsm_reg} - -%files hook-faqemu -%defattr(-, root, root, -) -%doc COPYING -%{_libexecdir}/%{vdsm_name}/vdsm-faqemu -%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu %files gluster %defattr(-, root, root, -) diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index e6a8280..0af4d71 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -18,13 +18,14 @@ # Refer to the README and COPYING files for full details of the license # -SUBDIRS = faqemu vhostmd qemucmdline - include $(top_srcdir)/build-aux/Makefile.subs # Additional hooks if HOOKS -SUBDIRS += \ +SUBDIRS = \ + faqemu \ + vhostmd \ + qemucmdline \ directlun \ fileinject \ floppy \ -- To view, visit http://gerrit.ovirt.org/7978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I552d6da620a200a051c22c43aa1697664e8ad131 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Jarod.w <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
