diff options
-rwxr-xr-x | configure | 5 | ||||
-rw-r--r-- | linux-user/main.c | 2 | ||||
-rw-r--r-- | monitor.c | 2 | ||||
-rw-r--r-- | vl.c | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -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" @@ -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) @@ -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) |