This commit changes the service file from static configuration to an autogenerated file, produced during the build. This will be relevant in a future commit.
Signed-off-by: Aaron Conole <[email protected]> --- rhel/.gitignore | 1 + rhel/automake.mk | 4 +++- rhel/openvswitch-fedora.spec.in | 9 +++++++++ ...hd.service => usr_lib_systemd_system_ovs-vswitchd.service.in} | 0 4 files changed, 13 insertions(+), 1 deletion(-) rename rhel/{usr_lib_systemd_system_ovs-vswitchd.service => usr_lib_systemd_system_ovs-vswitchd.service.in} (100%) diff --git a/rhel/.gitignore b/rhel/.gitignore index 164bb66..e584a1e 100644 --- a/rhel/.gitignore +++ b/rhel/.gitignore @@ -4,3 +4,4 @@ openvswitch-kmod-rhel6.spec openvswitch-kmod-fedora.spec openvswitch.spec openvswitch-fedora.spec +usr_lib_systemd_system_ovs-vswitchd.service diff --git a/rhel/automake.mk b/rhel/automake.mk index 2d9443f..11c8be0 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -28,13 +28,15 @@ EXTRA_DIST += \ rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \ rhel/usr_lib_systemd_system_openvswitch.service \ rhel/usr_lib_systemd_system_ovsdb-server.service \ - rhel/usr_lib_systemd_system_ovs-vswitchd.service \ + rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \ rhel/usr_lib_systemd_system_ovn-controller.service \ rhel/usr_lib_systemd_system_ovn-controller-vtep.service \ rhel/usr_lib_systemd_system_ovn-northd.service \ rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \ rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml +DISTCLEANFILES += rhel/usr_lib_systemd_system_ovs-vswitchd.service + update_rhel_spec = \ $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \ < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \ diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index fe86054..1061824 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -225,6 +225,15 @@ Docker network plugins for OVN. --enable-ssl \ --with-pkidir=%{_sharedstatedir}/openvswitch/pki +/usr/bin/perl build-aux/dpdkstrip.pl \ +%if %{with dpdk} + --dpdk \ +%else + --nodpdk \ +%endif + < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \ + > rhel/usr_lib_systemd_system_ovs-vswitchd.service + make %{?_smp_mflags} cd selinux make -f %{_datadir}/selinux/devel/Makefile diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in similarity index 100% rename from rhel/usr_lib_systemd_system_ovs-vswitchd.service rename to rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -- 2.9.4 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
