virt-manager/virtman-kvm-packages.diff

32 lines
1.4 KiB
Diff
Raw Normal View History

bnc#780660
Make process fails to substitute "" for ::HV_PACKAGES:: in virt-manager.py when
being built from virt-manager.py.in. Translate HV_ to KVM_ (just like all
the other macros)
Index: virt-manager-0.9.4/src/Makefile.am
===================================================================
--- virt-manager-0.9.4.orig/src/Makefile.am
+++ virt-manager-0.9.4/src/Makefile.am
@@ -65,7 +65,7 @@ endif
-e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \
-e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \
-e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \
- -e "s|::HV_PACKAGES::|$(KVM_PACKAGES)|" \
+ -e "s|::KVM_PACKAGES::|$(KVM_PACKAGES)|" \
-e "s|::ASKPASS_PACKAGE::|$(ASKPASS_PACKAGE)|" \
-e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
< $< > $@
Index: virt-manager-0.9.4/src/Makefile.in
===================================================================
--- virt-manager-0.9.4.orig/src/Makefile.in
+++ virt-manager-0.9.4/src/Makefile.in
@@ -814,7 +814,7 @@ uninstall-am: uninstall-binSCRIPTS unins
-e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \
-e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \
-e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \
- -e "s|::HV_PACKAGES::|$(KVM_PACKAGES)|" \
+ -e "s|::KVM_PACKAGES::|$(KVM_PACKAGES)|" \
-e "s|::ASKPASS_PACKAGE::|$(ASKPASS_PACKAGE)|" \
-e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
< $< > $@