From ea0b220c0d78c564b2531d484cdbcbe0ddacf117 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 16 Sep 2018 03:39:32 +0200
Subject: qemu: always pull and reset against integration tree

---
 src/tests/qemu/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index eed7d4d..8d76394 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -229,6 +229,11 @@ $(KERNEL_PATH)/.installed:
 	mkdir -p $(dir $(KERNEL_PATH))
 	flock -s $(dir $(KERNEL_TAR))/$(KERNEL_VERSION).lock git clone $(GIT_URI_$(patsubst %-git,%,$(patsubst %-debug,%,$(KERNEL_VERSION)))) $(KERNEL_PATH)
 	touch $@
+always-pull: $(KERNEL_PATH)/.installed
+	flock -s $(dir $(KERNEL_TAR))/$(KERNEL_VERSION).lock git -C $(KERNEL_PATH) fetch
+	flock -s $(dir $(KERNEL_TAR))/$(KERNEL_VERSION).lock git -C $(KERNEL_PATH) reset --hard FETCH_HEAD
+.PHONY: always-pull
+$(KERNEL_BZIMAGE): always-pull
 endif
 
 $(KERNEL_PATH)/.config: kernel.config arch/$(QEMU_ARCH).config | $(KERNEL_PATH)/.installed
-- 
cgit v1.2.3-59-g8ed1b