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_qemupluginbuild/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'build/f_isoroot/f_qemupluginbuild') diff --git a/build/f_isoroot/f_qemupluginbuild/Makefile b/build/f_isoroot/f_qemupluginbuild/Makefile index 4e8d9e9f6..19a233731 100644 --- a/build/f_isoroot/f_qemupluginbuild/Makefile +++ b/build/f_isoroot/f_qemupluginbuild/Makefile @@ -60,7 +60,11 @@ release:.qemubuild # - The SHA1 hash of the HEAD on the plugin repo's $(QEMU_BRANCH) # - The contents of this Makefile .cacheid: - @git ls-remote --heads $(QEMU_REPO) | grep $(QEMU_BRANCH) | awk {'print $$1'} > .cachedata + @if [ ! -z $(QEMU_CHANGE) ]; then \ + $(CACHETOOL) getcommitid $(QEMU_REPO) $(QEMU_CHANGE) > .cachedata; \ + else \ + $(CACHETOOL) getcommitid $(QEMU_REPO) $(QEMU_BRANCH) > .cachedata; \ + fi @sha1sum Makefile | awk {'print $$1'} >> .cachedata @sha1sum config.mk | awk {'print $$1'} >> .cachedata @cat .cachedata | $(CACHETOOL) getid > .cacheid -- cgit 1.2.3-korg