From nobody Tue Feb 10 00:23:09 2026 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 1551807499219349.40858839518444; Tue, 5 Mar 2019 09:38:19 -0800 (PST) Received: from localhost ([127.0.0.1]:46711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1E18-0006fj-8C for importer@patchew.org; Tue, 05 Mar 2019 12:38:14 -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) 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) 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-Google-Smtp-Source: APXvYqxYVdj+f5aFVdRZ6TnkuzCYszYO1wWVmtmL+s9q/J/sFnxY0e08etpTuZCUkv9y/OyrZeDB0A== X-Received: by 2002:adf:fa0d:: with SMTP id m13mr16777626wrr.93.1551806515148; Tue, 05 Mar 2019 09:21:55 -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 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::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=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic 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 Acked-by: Aleksandar Markovic Message-id: 20190228145624.24885-11-peter.maydell@linaro.org Reviewed-by: Richard Henderson --- Makefile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index add22cf2947..0f5fdc2d2b2 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