From 4a19f1eced611e7c3a0fba07d13515cbc73da09f Mon Sep 17 00:00:00 2001
From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue, 7 Apr 2009 23:17:49 +0000
Subject: [PATCH] Add --with-pkgversion. Allows distributors to identify their
builds without needing to hack the sources.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7036 c046a42c-6fe2-441c-8c8c-71466251a162
---
configure | 5 +++++
linux-user/main.c | 2 +-
monitor.c | 2 +-
vl.c | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 853541d591..0ea24c20b3 100755
--- a/configure
+++ b/configure
@@ -190,6 +190,7 @@ aix="no"
blobs="yes"
fdt="yes"
sdl_x11="no"
+pkgversion=""
# OS specific
if check_define __linux__ ; then
@@ -470,6 +471,8 @@ for opt do
;;
--kerneldir=*) kerneldir="$optarg"
;;
+ --with-pkgversion=*) pkgversion=" ($optarg)"
+ ;;
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
esac
@@ -1479,6 +1482,8 @@ qemu_version=`head $source_path/VERSION`
echo "VERSION=$qemu_version" >>$config_mak
echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
+echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_h
+
echo "SRC_PATH=$source_path" >> $config_mak
if [ "$source_path_used" = "yes" ]; then
echo "VPATH=$source_path" >> $config_mak
diff --git a/linux-user/main.c b/linux-user/main.c
index 3b9dfc7673..dd0058c0bf 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2202,7 +2202,7 @@ void cpu_loop (CPUState *env)
static void usage(void)
{
- printf("qemu-" TARGET_ARCH " version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
+ printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
"usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
"Linux CPU emulator (compiled for %s emulation)\n"
"\n"
diff --git a/monitor.c b/monitor.c
index ca1c11c478..e764b5df4e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -273,7 +273,7 @@ static void do_info(Monitor *mon, const char *item)
static void do_info_version(Monitor *mon)
{
- monitor_printf(mon, "%s\n", QEMU_VERSION);
+ monitor_printf(mon, "%s\n", QEMU_VERSION QEMU_PKGVERSION);
}
static void do_info_name(Monitor *mon)
diff --git a/vl.c b/vl.c
index e444f9c2c6..ddbcc6c2a6 100644
--- a/vl.c
+++ b/vl.c
@@ -3942,7 +3942,7 @@ static int main_loop(void)
static void version(void)
{
- printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n");
+ printf("QEMU PC emulator version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n");
}
static void help(int exitcode)
--
2.30.2