From patchwork Tue Mar 5 17:21:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 159707 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5234234jad; Tue, 5 Mar 2019 09:36:48 -0800 (PST) X-Google-Smtp-Source: APXvYqx1qIcX2yuE4uzJg8NP5+Ek/WBkfM+I4d2pcWRbtIaMC7oBJ7s9apDo8yNhMaLNJn4wfzFO X-Received: by 2002:a81:8441:: with SMTP id u62mr1931168ywf.10.1551807408470; Tue, 05 Mar 2019 09:36:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551807408; cv=none; d=google.com; s=arc-20160816; b=UWgkZQFdHyIQ8Aa0MBK8Fexr8t62AgYGjcHoEyXcUBMP7f2yhXCvED6hz15XcjhVoX qjJAGQXhr60RHb7YaYqVlURWl5vT1gPWuJ9jQyzqERQIx3NG7bbXkm2WRDpuop7sUVre 1eVYLkOhKaopoOrPW3ZCRqY6XxNAm2tCaMhZ224ZE8sp3YNotwh+QeMzd4+mTWCVSgMt EXF0a0Nn6aprlMtGC+HDJ7boLYs3WMc/+y/WduiSF7Qm1oMRZx1DwFsvc8g/HmFZd4w6 JNup5UXF/d71wWo0U/unBqpNmA+HjYNtlJlUtTFOn+CGc/9b8ulKcvkYDslOkh9eOwV+ j6jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Z84Z1uZ6193RzY2x7LIy2GcmEPEbxZgOCrzhwfmtHHU=; b=0JUOCEg3qM++8qPi8WS0tVHsOIkSg/CQgkj6tKTcpVvRr01vfJ9mBx+sFqGW8b8iVd l8DDFk9OlmjemS/Q7hMkSvWzvRFxbHYE96yg+JC5ckQVxuGMqZaCvElNkV2bG1eC5cGh /sUQOwVSZtlbruXnxdDLLdWIpabthmpgFNQRAOY+JjqP1mhGj5qrgwbDz6nJCQCxpQcV mqEC/4zGwd6hna1+BS07gaPUdJmB0N99X2cWHmlX3ubCM3cNhS1QWB1Q3mUlbO3R0JtL YdQZfItktY2tLODF97trDrRKnKmzAgMCgcJHOcrr31RFF9GyKMa4Fo7t/XSMuOqKq/Gx TM0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S0VjJBvo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 131si5468960ybw.116.2019.03.05.09.36.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2019 09:36:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S0VjJBvo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:46699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1Dzj-0005V9-Tz for patch@linaro.org; Tue, 05 Mar 2019 12:36:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DlN-0002Ge-EY for qemu-devel@nongnu.org; Tue, 05 Mar 2019 12:21:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1DlM-0001CK-GT for qemu-devel@nongnu.org; Tue, 05 Mar 2019 12:21:57 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1DlM-0001A1-98 for qemu-devel@nongnu.org; Tue, 05 Mar 2019 12:21:56 -0500 Received: by mail-wr1-x443.google.com with SMTP id d17so10362613wre.10 for ; Tue, 05 Mar 2019 09:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z84Z1uZ6193RzY2x7LIy2GcmEPEbxZgOCrzhwfmtHHU=; b=S0VjJBvoGJNmC7xOfHj3XSJCWLhl14NyDgcYWGy4hYtfRObpdzv3yE7CBFtvoI/4zu ewXpcFP6Nq/zah0LgJGetUSn6Ii4ei9O6mZapmwPgTUdoHKvPlANeQX/3gxfml0+OTJx TqEu5gBUgufLDe7na38TKQtVvxErVl8J7aLtYyYHwl+Ey/Cqz5GW+xZJnK0LROh1tMhR NxnQtBKa7rssnLPRVHSnEazDg59AWxLdOz2PYcgJLgKqx7zyEVcFLN/DYJAm7gCmZn8E cT0lrPUTEy96Fm94GHrJEGDZD57lUT+9SOb7FwTKFmKIg5eH3v+BTeg5BQoh4qeJNYPs +HIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z84Z1uZ6193RzY2x7LIy2GcmEPEbxZgOCrzhwfmtHHU=; b=SpCRFBBClXBAAaE+QkXXhjTegNaQu3ien94TYLQ2mxd74zloi/BVHAIUcu7EduowyU JCUjcz58lN2r56cYzV2wkCGKDIphG2rPmhLqhpazdx5ubYbDfXXG6oMWd7tZBzpV+icE MvhiuIisi0RuwNZsvTouVeuUxuP5ukQBT7visTJyooRNLl0hfHtgQvYdbDyRoBP2PsKC 2drBNNL3Z3bSaD/aaehuwjZcCxko1Ts/vFeN0XLg2RryK5EfhAUf4CvcOTRgF08cek8H rVTZsgC7X127dPW9CpJKghVaF9pjXI9d/oXv9duHOSjJanbxb+ypKah41blHA7OWhsD3 DE5w== X-Gm-Message-State: APjAAAWBt1TL7YDI9ZRPwpNQgnfFeCmYqCZmu5TAQAZ3HtBJMwYvkwou nxXSlaqduzgXWbqtdlV+7CL/sHPReVA= X-Received: by 2002:adf:fa0d:: with SMTP id m13mr16777626wrr.93.1551806515148; Tue, 05 Mar 2019 09:21:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b195sm48289wmg.36.2019.03.05.09.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 09:21:54 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2019 17:21:37 +0000 Message-Id: <20190305172139.32662-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305172139.32662-1-peter.maydell@linaro.org> References: <20190305172139.32662-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v3 10/12] Makefile: Abstract out "identify the pkgversion" code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Abstract out the "identify the pkgversion" code from the rule for creating qemu-version.h, so it sets makefile variables for QEMU_PKGVERSION and QEMU_FULL_VERSION. (We will want to use these when building the Sphinx docs.) Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Acked-by: Aleksandar Markovic Message-id: 20190228145624.24885-11-peter.maydell@linaro.org --- Makefile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/Makefile b/Makefile index add22cf2947..0f5fdc2d2b2 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,20 @@ endif include $(SRC_PATH)/rules.mak +# Create QEMU_PKGVERSION and FULL_VERSION strings +# If PKGVERSION is set, use that; otherwise get version and -dirty status from git +QEMU_PKGVERSION := $(if $(PKGVERSION),$(PKGVERSION),$(shell \ + cd $(SRC_PATH); \ + if test -d .git; then \ + git describe --match 'v*' 2>/dev/null | tr -d '\n'; \ + if ! git diff-index --quiet HEAD &>/dev/null; then \ + echo "-dirty"; \ + fi; \ + fi)) + +# Either "version (pkgversion)", or just "version" if pkgversion not set +FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSION)) + GENERATED_FILES = qemu-version.h config-host.h qemu-options.def GENERATED_QAPI_FILES = qapi/qapi-builtin-types.h qapi/qapi-builtin-types.c @@ -392,23 +406,8 @@ all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all mo qemu-version.h: FORCE $(call quiet-command, \ - (cd $(SRC_PATH); \ - if test -n "$(PKGVERSION)"; then \ - pkgvers="$(PKGVERSION)"; \ - else \ - if test -d .git; then \ - pkgvers=$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\ - if ! git diff-index --quiet HEAD &>/dev/null; then \ - pkgvers="$${pkgvers}-dirty"; \ - fi; \ - fi; \ - fi; \ - printf "#define QEMU_PKGVERSION \"$${pkgvers}\"\n"; \ - if test -n "$${pkgvers}"; then \ - printf '#define QEMU_FULL_VERSION QEMU_VERSION " (" QEMU_PKGVERSION ")"\n'; \ - else \ - printf '#define QEMU_FULL_VERSION QEMU_VERSION\n'; \ - fi; \ + (printf '#define QEMU_PKGVERSION "$(QEMU_PKGVERSION)"\n'; \ + printf '#define QEMU_FULL_VERSION "$(FULL_VERSION)"\n'; \ ) > $@.tmp) $(call quiet-command, if ! cmp -s $@ $@.tmp; then \ mv $@.tmp $@; \