X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=2daf47adb4b7a351343f9f4cbbb59141da4e4dd7;hb=HEAD;hp=4eb03b658b72a2a714ff3ba28126d018d3627a7e;hpb=33f494780fed13daabda23be6ceef83210e1d403;p=openstack-build%2Fneutron-build.git diff --git a/trusty/debian/rules b/trusty/debian/rules index 4eb03b658..2daf47adb 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/openstack-pkg-tools/pkgos.make -export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/') +export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) PYTHONS:=$(shell pyversions -vr) @@ -9,41 +9,105 @@ PYTHONS:=$(shell pyversions -vr) dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc override_dh_auto_install: - echo "Nothing to do!" -# dh_auto_install -# find . -type d -name tests | xargs rm -fr -# for i in neutron/db/migration/alembic_migrations/versions/*.py ; do \ -# install -D -m 0664 $$i debian/tmp/usr/lib/python2.6/dist-packages/$$i ; \ -# install -D -m 0664 $$i debian/tmp/usr/lib/python2.7/dist-packages/$$i ; \ -# done + echo "Do nothing" override_dh_install: - set -e ; for pyvers in $(PYTHONS) ; do \ - python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR)/debian/neutron-common ; \ - python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp ; \ - mkdir -p $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \ - cp -auxf neutron $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \ - done - dh_install -O--buildsystem=python_distutils --fail-missing -X/usr/etc -X/usr/bin - rm -rf $(CURDIR)/debian/neutron-common/usr/lib - rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum* - rm -rf $(CURDIR)/debian/neutron-common/usr/etc - - install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini - - install -D -m 0640 etc/metadata_agent.ini $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini - sed -i -e 's|^# nova_metadata_ip = 127.0.0.1|nova_metadata_ip = 127.0.0.1|' $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini - - # Move the OVS config file, since we use debconf for it - rm $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/openvswitch_agent.ini - install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini + rm -rf $(CURDIR)/debian/tmp + python2.7 setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp + cp -auxf neutron $(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages + rm -rf $(CURDIR)/debian/tmp/usr/etc + + # dhcp_agent.ini + mkdir -p $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron/dhcp_agent.ini \ + --wrap-width 140 \ + --namespace neutron.base.agent \ + --namespace neutron.dhcp.agent \ + --namespace oslo.log + + # l3_agent.ini + mkdir -p $(CURDIR)/debian/neutron-l3-agent/etc/neutron + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-l3-agent/etc/neutron/l3_agent.ini \ + --wrap-width 140 \ + --namespace neutron.base.agent \ + --namespace neutron.l3.agent \ + --namespace oslo.log + + # linuxbridge_agent.ini + mkdir -p $(CURDIR)/debian/neutron-linuxbridge-agent/etc/neutron/plugins/ml2 + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-linuxbridge-agent/etc/neutron/plugins/ml2/linuxbridge_agent.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.linuxbridge.agent \ + --namespace oslo.log + + # metadata_agent.ini + mkdir -p $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini \ + --wrap-width 140 \ + --namespace neutron.metadata.agent \ + --namespace oslo.log + + # metering_agent.ini + mkdir -p $(CURDIR)/debian/neutron-metering-agent/etc/neutron + PYTHONPATH=$(CURDIR)/debian/tmp oslo-config-generator --output-file $(CURDIR)/debian/neutron-metering-agent/etc/neutron/metering_agent.ini \ + --wrap-width 140 \ + --namespace neutron.metering.agent \ + --namespace oslo.log + + # ml2_conf.ini + mkdir -p $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2 + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini \ + --wrap-width 140 \ + --namespace neutron.ml2 \ + --namespace oslo.log + + # ml2_conf_sriov.ini + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf_sriov.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.sriov \ + --namespace oslo.log + + # neutron.conf + mkdir -p $(CURDIR)/debian/neutron-common/usr/share/neutron-common + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf \ + --wrap-width 140 \ + --namespace neutron \ + --namespace neutron.agent \ + --namespace neutron.db \ + --namespace neutron.extensions \ + --namespace neutron.qos \ + --namespace nova.auth \ + --namespace oslo.log \ + --namespace oslo.db \ + --namespace oslo.policy \ + --namespace oslo.concurrency \ + --namespace oslo.messaging \ + --namespace oslo.middleware.cors \ + --namespace oslo.service.sslutils \ + --namespace oslo.service.wsgi \ + --namespace keystonemiddleware.auth_token + + + # openvswitch_agent.ini + mkdir -p $(CURDIR)/debian/neutron-common/usr/share/neutron-common + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.ovs.agent \ + --namespace oslo.log + + # sriov_agent.ini + mkdir -p $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2 + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/sriov_agent.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.sriov.agent \ + --namespace oslo.log + + dh_install --fail-missing -X/usr/etc override_dh_auto_clean: dh_auto_clean - rm -f neutron/vcsversion.py find . -type f -name "*.pyc" | xargs rm -fr rm -rf build neutron.egg-info - rm -rf setuptools_git-*-py*.egg/ rm -f debian/neutron-common.config \ debian/neutron-common.postinst \ debian/neutron-server.config \ @@ -59,7 +123,7 @@ override_dh_clean: override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - PYTHONPATH=build/* ./run_tests.sh -N -P || true + PYTHONPATH=build/* ./run_tests.sh -N -P endif override_dh_auto_build: @@ -75,7 +139,7 @@ override_dh_auto_build: override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) - python setup.py build_sphinx - cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc - dh_sphinxdoc -O--buildsystem=python_distutils + python setup.py build_sphinx + cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc + dh_sphinxdoc -O--buildsystem=python_distutils endif