Merge "Remove patching 'netmask' from isolinux.cfg"

[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 443a8e3..71f2771 100644 (file)
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -51,6 +51,9 @@ release:.bgpvpnbuild
        $(REPOINFO) -r . > gitinfo_bgpvpnplugin.txt
        rm -rf fuel-plugin-bgpvpn
        touch .bgpvpnbuild
+       # Store artifact in cache straight away if caching is enabled
+       # (no .cacheid will be present unless this is a cached build)
+       test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
 
 #############################################################################
 # Cache operations - only used when building through ci/build.sh
@@ -61,7 +64,11 @@ release:.bgpvpnbuild
 #   - The SHA1 hash of the HEAD on the plugin repo's $(BGPVPN_BRANCH)
 #   - The contents of this Makefile
 .cacheid:
-       git ls-remote --heads $(BGPVPN_REPO) | grep $(BGPVPN_BRANCH) > .cachedata
+       @if [ ! -z $(BGPVPN_CHANGE) ]; then \
+         $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_CHANGE) > .cachedata; \
+       else \
+         $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_BRANCH) > .cachedata; \
+       fi
        sha1sum Makefile >> .cachedata
        sha1sum config.mk >> .cachedata
        cat .cachedata | $(CACHETOOL) getid > .cacheid