[Qemu-devel] [7036] Add --with-pkgversion.

[Paul Brook]

Revision: 7036
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7036
Author:   pbrook
Date:     2009-04-07 23:17:49 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Add --with-pkgversion.
Allows distributors to identify their builds without needing to hack the
sources.

Signed-off-by: Paul Brook <address@hidden>

Modified Paths:
--------------
    trunk/configure
    trunk/linux-user/main.c
    trunk/monitor.c
    trunk/vl.c

Modified: trunk/configure
===================================================================
--- trunk/configure     2009-04-07 22:58:45 UTC (rev 7035)
+++ trunk/configure     2009-04-07 23:17:49 UTC (rev 7036)
@@ -190,6 +190,7 @@
 blobs="yes"
 fdt="yes"
 sdl_x11="no"
+pkgversion=""
 
 # OS specific
 if check_define __linux__ ; then
@@ -470,6 +471,8 @@
   ;;
   --kerneldir=*) kerneldir="$optarg"
   ;;
+  --with-pkgversion=*) pkgversion=" ($optarg)"
+  ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
   esac
@@ -1479,6 +1482,8 @@
 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

Modified: trunk/linux-user/main.c
===================================================================
--- trunk/linux-user/main.c     2009-04-07 22:58:45 UTC (rev 7035)
+++ trunk/linux-user/main.c     2009-04-07 23:17:49 UTC (rev 7036)
@@ -2202,7 +2202,7 @@
 
 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"

Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c     2009-04-07 22:58:45 UTC (rev 7035)
+++ trunk/monitor.c     2009-04-07 23:17:49 UTC (rev 7036)
@@ -273,7 +273,7 @@
 
 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)

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2009-04-07 22:58:45 UTC (rev 7035)
+++ trunk/vl.c  2009-04-07 23:17:49 UTC (rev 7036)
@@ -3942,7 +3942,7 @@
 
 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)