aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-06-07 13:02:29 +0930
committerPeter Maydell <peter.maydell@linaro.org>2012-07-25 13:35:07 +0100
commit7260502e13e237f7cc28d415eaa8b21dfc2cd278 (patch)
tree4b5a4f8949e2b4787a3bf0040758a1011a48ea8b
parent2324f4fe8172d9016f5ed3bdfc6cab81bd36c2ae (diff)
downloadqemu-arm-7260502e13e237f7cc28d415eaa8b21dfc2cd278.tar.gz
Add Linaro versioning
Add a VERSION.LINARO file so it's clear that tarball releases are from Linaro rather than upstream, and make the configure pkgversion default to the Linaro version number so that the -version option says Linaro too (even if the user built from the tarball without specifying -pkgversion to configure). Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--VERSION.LINARO1
-rwxr-xr-xconfigure7
2 files changed, 8 insertions, 0 deletions
diff --git a/VERSION.LINARO b/VERSION.LINARO
new file mode 100644
index 0000000000..6c0400c774
--- /dev/null
+++ b/VERSION.LINARO
@@ -0,0 +1 @@
+qemu-linaro from git
diff --git a/configure b/configure
index cef0a71a27..066b4a064b 100755
--- a/configure
+++ b/configure
@@ -196,6 +196,13 @@ guest_agent="yes"
libiscsi=""
coroutine=""
+# If this is a Linaro QEMU tarball then default the pkgversion
+# string to say so, so that we clearly distinguish ourselves
+# from upstream (and can take the blame for bugs).
+if [ -e "$source_path/VERSION.LINARO" ]; then
+ pkgversion=" ($(head "$source_path/VERSION.LINARO"))"
+fi
+
# parse CC options first
for opt do
optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`