From nobody Sat Oct 4 18:47:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551366413020938.4269483642105; Thu, 28 Feb 2019 07:06:53 -0800 (PST) Received: from localhost ([127.0.0.1]:39802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzNGs-0003Im-02 for importer@patchew.org; Thu, 28 Feb 2019 10:06:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzN7X-0004zm-PT for qemu-devel@nongnu.org; Thu, 28 Feb 2019 09:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzN7V-0008BO-LZ for qemu-devel@nongnu.org; Thu, 28 Feb 2019 09:57:11 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzN7S-0007tK-CQ for qemu-devel@nongnu.org; Thu, 28 Feb 2019 09:57:07 -0500 Received: by mail-wm1-x341.google.com with SMTP id a62so9573497wmh.4 for ; Thu, 28 Feb 2019 06:56:57 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c17sm14047539wrs.17.2019.02.28.06.56.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 06:56: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=CdQeJ6sH6vZzcVaDPWqQdGDjNFU4YeawHVoENir51c8=; b=V7hNXuXMMZFhdORp0WTV+lGKxc+XyQKPketVcZNQtQ9Q1XZwy10KqF8DbCVBQpIdVZ p8JCp7H/+0b8qW2IGu/P26RtL+f7gelsX3U4jkcNNPjqL9J2SyXZo3e+JnoIe2Ij11RP ELR12XG4bPWX0o6JY8N10rxc6kufDtgQ+RQRxZ0I6SJ4lsDCZMDdmpKJukH8DETbEfv7 SjZqGhxE5kMrkc0deFjd5glo9DtWNJGOlBnyRr3P52I1Gg2sLp+8FjjGqQU2m440PLqG BmxfzaouilsFC520x7+y9Lnt8LJCi3UA036NYAIA2uTNU0ae/nKA6mdNfWXq6KJcwCqF QG1A== 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=CdQeJ6sH6vZzcVaDPWqQdGDjNFU4YeawHVoENir51c8=; b=n29I90GyXdb6sxov5e/DOAG7F5rgApx/xCU2sKEsl3MnKvthFAspuZAOipQLsk2T8j hdFLUIOhh5cY1P/REgnIdkLBQbR8vc7FyM6Aez8VbproCiCCXt7upd3jXZ+B7U6osb1F yMB96Q/geX+A5DMx6m1Mxi74BdYSTxmoPEM8/p3Inqk2pwl+atNe43AA84/euxa+dxWy 5H9V7wZIGqftFG2G1JsMSoTkYPfBz2n896i60dqzyQOXaiSBcFS+dXg/QdF+gdlEhDB1 6jxNW+r0z6T9oMMtinDvAzFB8uvGi6Y43EEaW4e63IrhK31rEZrSeRoF8GflvcENmiwL eH2g== X-Gm-Message-State: AHQUAubNlIzboYhvNjSbrbNUYRM2wJnjWGn9Ij+PjALO6oj4619SIlmg sOkL1GA9Rk2BC4IjlSkfkShsj3n/NX4= X-Google-Smtp-Source: AHgI3IZR12KnbTHCMoHVqMKN3orXDDQ6oYlvvgBztYBVmnx98U9BU3N9QUQXJQ9qI24eFAjB+2ZEzQ== X-Received: by 2002:a1c:7a1a:: with SMTP id v26mr39436wmc.129.1551365816705; Thu, 28 Feb 2019 06:56:56 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 14:56:23 +0000 Message-Id: <20190228145624.24885-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228145624.24885-1-peter.maydell@linaro.org> References: <20190228145624.24885-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v2 10/11] 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: patches@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e --- Makefile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index d6b897be0bc..46cb8e62571 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,20 @@ endif =20 include $(SRC_PATH)/rules.mak =20 +# Create QEMU_PKGVERSION and FULL_VERSION strings +# If PKGVERSION is set, use that; otherwise get version and -dirty status = from git +QEMU_PKGVERSION :=3D $(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 :=3D $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),= $(VERSION)) + GENERATED_FILES =3D qemu-version.h config-host.h qemu-options.def =20 GENERATED_QAPI_FILES =3D 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 =20 qemu-version.h: FORCE $(call quiet-command, \ - (cd $(SRC_PATH); \ - if test -n "$(PKGVERSION)"; then \ - pkgvers=3D"$(PKGVERSION)"; \ - else \ - if test -d .git; then \ - pkgvers=3D$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\ - if ! git diff-index --quiet HEAD &>/dev/null; then \ - pkgvers=3D"$${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 $@; \ --=20 2.20.1