qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laszlo Ersek <lersek@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH] configure: save git working tree information in "pkgversion"
Date: Tue, 31 May 2016 17:04:04 +0200	[thread overview]
Message-ID: <1464707044-10447-1-git-send-email-lersek@redhat.com> (raw)

When building QEMU from a git working tree (either in-tree or
out-of-tree), it is useful to capture the working tree status in the QEMU
binary, for the "-version" option to report.

Daniel suggested using the "pkgversion" variable (tied to the
"--with-pkgversion" option) of the configure script for this. Downstream
packagers of QEMU already use this option for customizing their builds,
plus libvirtd captures "pkgversion" (with the "-version" option) in
"/var/log/libvirt/qemu/$GUEST.log", whenever a guest is started.

The information we include in "pkgversion" is the output of git-describe,
with a plus sign (+) appended if there are staged or unstaged changes to
tracked files, at the time of "configure" being executed.

The content of "pkgversion" is not changed when "--with-pkgversion" is
used on the command line.

Cc: "Daniel P. Berrange" <berrange@redhat.com>
Cc: Kashyap Chamarthy <kchamart@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 configure | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/configure b/configure
index b5aab7257b33..20a7ec5cc0fd 100755
--- a/configure
+++ b/configure
@@ -4255,6 +4255,44 @@ if have_backend "dtrace"; then
 fi
 
 ##########################################
+# save git working tree information in pkgversion
+
+# If pkgversion has not been set to a non-empty string, fetch the output of
+# "git describe" into it. If the working tree is unclean (there are staged or
+# unstaged changes in tracked files), then append a plus sign.
+#
+# If we're not building from a git working tree, then pkgversion is not
+# changed. Otherwise, git errors are fatal.
+
+if test -z "$pkgversion" && test -d "$source_path/.git"; then
+  pkgversion=$(
+    export GIT_DIR=$source_path/.git
+    export GIT_WORK_TREE=$source_path
+
+    git_desc=$(git describe)
+    git_exit=$?
+    if test $git_exit -ne 0; then
+      exit $git_exit
+    fi
+
+    git_changes=
+    for git_diff_option in "" --staged; do
+      git diff $git_diff_option --quiet
+      git_exit=$?
+      case $git_exit in
+      (0) ;;
+      (1) git_changes=+
+          ;;
+      (*) exit $git_exit
+          ;;
+      esac
+    done
+
+    printf " (%s%s)" "$git_desc" "$git_changes"
+  ) || error_exit "Failed to get git description, working tree or index status"
+fi
+
+##########################################
 # check and set a backend for coroutine
 
 # We prefer ucontext, but it's not always possible. The fallback
-- 
1.8.3.1

             reply	other threads:[~2016-05-31 15:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-31 15:04 Laszlo Ersek [this message]
2016-05-31 15:14 ` [Qemu-devel] [PATCH] configure: save git working tree information in "pkgversion" Daniel P. Berrange
2016-05-31 15:40   ` Laszlo Ersek
2016-05-31 15:43     ` Daniel P. Berrange
2016-05-31 17:01       ` Laszlo Ersek
2016-05-31 17:45         ` Eric Blake
2016-05-31 21:16           ` Laszlo Ersek
2016-06-01  8:55           ` Laszlo Ersek
2016-06-01  9:11             ` Fam Zheng
2016-06-01  9:36 ` Kashyap Chamarthy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464707044-10447-1-git-send-email-lersek@redhat.com \
    --to=lersek@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).