rhel: Fix firewalld additions.

When I updated this patch for v2, I made some mistakes. This fixes them. The first is that we need to create a directory in the rpm build root for the firewalld service files before we can install them there. Second, I made two typos when I updated the patch to use %{_prefix}. Fixes: 55f36be ("rhel: Firewall service files for OVN.") Signed-off-by: Russell Bryant <[email protected]>
keyman9848 · Feb 5, 2017 · d5c2862 · d5c2862
1 parent 70a0573
commit d5c2862
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
@@ -234,6 +234,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf
 install -p -m 644 -D selinux/openvswitch-custom.pp \
         $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
 
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/
 install rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \
         $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
 install rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \
@@ -524,13 +525,13 @@ fi
 %config %{_datadir}/openvswitch/ovn-nb.ovsschema
 %config %{_datadir}/openvswitch/ovn-sb.ovsschema
 %{_unitdir}/ovn-northd.service
-${_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
+%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
 
 %files ovn-host
 %{_bindir}/ovn-controller
 %{_mandir}/man8/ovn-controller.8*
 %{_unitdir}/ovn-controller.service
-${_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml
+%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml
 
 %files ovn-vtep
 %{_bindir}/ovn-controller-vtep