From 23e7333bb4e4ec228596d994bec18dc8d0670b2e Mon Sep 17 00:00:00 2001 From: "Stefan K. Berg" Date: Fri, 18 Dec 2015 12:53:46 +0100 Subject: Align all plugins with new method for cache id The cache tool is now responsible for returning the commit ID of a branch, tag or commit. This change was first introduced in the bgpvpn plugin and now the rest of the plugins with a need for this are also using the same method. Without this, a plugin pointing to a commit ID on master would fail to build once the head of master is updated to point to a later commit... Change-Id: I7c32d5b41871741717ae42c1334e8557f0b0bedd Signed-off-by: Stefan K. Berg --- build/f_isoroot/f_bgpvpn-pluginbuild/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/f_isoroot/f_bgpvpn-pluginbuild') diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile index 3da8d38b9..a99a426b6 100644 --- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile +++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile @@ -61,7 +61,7 @@ release:.bgpvpnbuild # - The SHA1 hash of the HEAD on the plugin repo's $(BGPVPN_BRANCH) # - The contents of this Makefile .cacheid: - if [ ! -z $(BGPVPN_CHANGE) ]; then \ + @if [ ! -z $(BGPVPN_CHANGE) ]; then \ $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_CHANGE) > .cachedata; \ else \ $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_BRANCH) > .cachedata; \ -- cgit 1.2.3-korg