diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-12-18 12:53:46 +0100 |
|---|---|---|
| committer |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-12-21 17:52:48 +0000 |
| commit | 23e7333bb4e4ec228596d994bec18dc8d0670b2e (patch) | |
| tree | fb4a4aec4460b8b86ad0feddf4e99faa10bc7b48 /build/f_isoroot/f_qemupluginbuild | |
| parent | e354b304952bb87547d9ee7298b8a5b78394e401 (diff) | |
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 <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/f_isoroot/f_qemupluginbuild')
| -rw-r--r-- | build/f_isoroot/f_qemupluginbuild/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
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 |