f_tackerpluginbuild: Fix obsolete mitaka branch

[fuel.git] / build / f_isoroot / f_bgpvpn-pluginbuild / Makefile

diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
index ed3be29..a236b63 100644 (file)
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -34,6 +34,12 @@ release:.bgpvpnbuild
        cp gitinfo_bgpvpnplugin.txt $(BUILD_BASE)
 
 .bgpvpnbuild:
+       # The python packages build into deb by this plugin require a newer
+       # setuptools install a newer setuptools version until the container
+       # where this is run is bumped to ubuntu 16.04.
+       # --user is used because there is already a setuptools installation
+       #  managed by apt.
+       pip install setuptools --upgrade --user
        rm -rf fuel-plugin-bgpvpn
        git clone $(BGPVPN_REPO)
        cd fuel-plugin-bgpvpn; \
@@ -67,6 +73,7 @@ release:.bgpvpnbuild
        fi
        sha1sum Makefile >> .cachedata
        sha1sum config.mk >> .cachedata
+       echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
        cat .cachedata | $(CACHETOOL) getid > .cacheid
 
 # Clean local data related to caching - called prior to ordinary build