X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=rhel%2Fautomake.mk;h=9cd9a415e7ee6aecd3f523f90c524f098cd52f2f;hb=cfc50ae514f805dcd9c14589f21158185424daf6;hp=3bdc4cedf976f1984998371c18449364973cc3eb;hpb=d8fe0a6ac8e9a21917ba4faab9e2a376e2a1a9fc;p=sliver-openvswitch.git diff --git a/rhel/automake.mk b/rhel/automake.mk index 3bdc4cedf..9cd9a415e 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -12,11 +12,9 @@ EXTRA_DIST += \ rhel/etc_logrotate.d_openvswitch \ rhel/etc_sysconfig_network-scripts_ifdown-ovs \ rhel/etc_sysconfig_network-scripts_ifup-ovs \ - rhel/kmodtool-openvswitch-el5.sh \ - rhel/openvswitch-kmod-rhel5.spec \ - rhel/openvswitch-kmod-rhel5.spec.in \ rhel/openvswitch-kmod-rhel6.spec \ rhel/openvswitch-kmod-rhel6.spec.in \ + rhel/openvswitch-kmod.files \ rhel/openvswitch-kmod-fedora.spec \ rhel/openvswitch-kmod-fedora.spec.in \ rhel/openvswitch.spec \ @@ -24,16 +22,15 @@ EXTRA_DIST += \ rhel/openvswitch-fedora.spec \ rhel/openvswitch-fedora.spec.in \ rhel/usr_share_openvswitch_scripts_sysconfig.template \ - rhel/usr_lib_systemd_system_openvswitch.service + rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \ + rhel/usr_lib_systemd_system_openvswitch.service \ + rhel/usr_lib_systemd_system_openvswitch-nonetwork.service update_rhel_spec = \ ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \ < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \ if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi -$(srcdir)/rhel/openvswitch-kmod-rhel5.spec: rhel/openvswitch-kmod-rhel5.spec.in $(top_builddir)/config.status - $(update_rhel_spec) - $(srcdir)/rhel/openvswitch-kmod-rhel6.spec: rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status $(update_rhel_spec)