Skip to content

Commit

Permalink
Use setup.py to install calico-diags, instead of deb/rpm incantations
Browse files Browse the repository at this point in the history
As well as simplicity, this has the advantage that calico-diags will
be correctly installed (including in a virtualenv, if applicable) if
the calico code is installed using 'pip install'.
  • Loading branch information
Neil Jerram authored and Neil Jerram committed Nov 25, 2015
1 parent ed18472 commit 23b9f27
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion debian/rules
Expand Up @@ -15,5 +15,4 @@ override_dh_install:
install etc/bird/*.template debian/tmp/usr/share/calico/bird
install -d debian/tmp/usr/bin
install -m 755 etc/*.sh debian/tmp/usr/bin
install -m 755 utils/diags.sh debian/tmp/usr/bin/calico-diags
dh_install
1 change: 0 additions & 1 deletion rpm/calico.spec
Expand Up @@ -111,7 +111,6 @@ install -d %{buildroot}%{_datadir}/calico/bird
install etc/bird/*.template %{buildroot}%{_datadir}/calico/bird
install -d %{buildroot}%{_bindir}
install -m 755 etc/*.sh %{buildroot}%{_bindir}
install -m 755 utils/diags.sh %{buildroot}%{_bindir}/calico-diags

install -d -m 755 %{buildroot}/%{_sysconfdir}/logrotate.d
install -m 644 %_sourcedir/calico-felix.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/calico-felix
Expand Down
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -78,5 +78,6 @@ def filter_requirements(filters, file):
'calico-felix = calico.felix.felix:main',
],
},
scripts=['utils/calico-diags'],
install_requires=collect_requirements()
)
File renamed without changes.

0 comments on commit 23b9f27

Please sign in to comment.