From: Ian Jackson Date: Tue, 21 Apr 2015 10:27:59 +0000 (+0100) Subject: Config.mk: Fix (and, effectively, update) QEMU_TAG X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3398 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d4c0952f8da103e99d9b8c1fc6814dabd397df6;p=xen.git Config.mk: Fix (and, effectively, update) QEMU_TAG In 952944f7 "QEMU_TAG update" my tag update script mangled the machinery which sets QEMU_TRADITIONAL_REVISION, by replacing the first assignment to QEMU_TRADITIONAL_REVISION it found rather than the one which ought to have been replaced. The result was that: * From that commit on, QEMU_TAG was no longer honoured although QEMU_TRADITIONAL_REVISION still was * That particular update to QEMU_TRADITIONAL_REVISION's default value was effective * The next attempt to update QEMU_TRADITIONAL_REVISION, in 1fc3aeb3 "libxl: use new QEMU xenstore protocol" was totally ineffective. Fix this by restoring the transfer from QEMU_TAG. The effects are: * Once more, honour QEMU_TAG. * Belatedly apply the qemu-trad change part of "libxl: use new QEMU xenstore protocol. (I have also fixed my script to not do this again.) Signed-off-by: Ian Jackson CC: Wei Liu CC: Ian Campbell CC: George Dunlap CC: Jan Beulich Reported-by: Jan Beulich Acked-by: Jan Beulich --- diff --git a/Config.mk b/Config.mk index e5976fc009..28b77d6315 100644 --- a/Config.mk +++ b/Config.mk @@ -237,9 +237,7 @@ ifneq (,$(CONFIG_QEMU)) QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU) endif ifneq (,$(QEMU_TAG)) -QEMU_TRADITIONAL_REVISION ?= ab42b4408cb4fc4f869d73218e3d2034e6f5e8ac -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) endif ifeq ($(GIT_HTTP),y)