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
This commit is contained in:
pbrook 2009-04-07 23:17:49 +00:00
parent 9bd7e6d90d
commit 4a19f1eced
4 changed files with 8 additions and 3 deletions

5
configure vendored
View File

@ -190,6 +190,7 @@ aix="no"
blobs="yes" blobs="yes"
fdt="yes" fdt="yes"
sdl_x11="no" sdl_x11="no"
pkgversion=""
# OS specific # OS specific
if check_define __linux__ ; then if check_define __linux__ ; then
@ -470,6 +471,8 @@ for opt do
;; ;;
--kerneldir=*) kerneldir="$optarg" --kerneldir=*) kerneldir="$optarg"
;; ;;
--with-pkgversion=*) pkgversion=" ($optarg)"
;;
*) echo "ERROR: unknown option $opt"; show_help="yes" *) echo "ERROR: unknown option $opt"; show_help="yes"
;; ;;
esac esac
@ -1479,6 +1482,8 @@ qemu_version=`head $source_path/VERSION`
echo "VERSION=$qemu_version" >>$config_mak echo "VERSION=$qemu_version" >>$config_mak
echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_h
echo "SRC_PATH=$source_path" >> $config_mak echo "SRC_PATH=$source_path" >> $config_mak
if [ "$source_path_used" = "yes" ]; then if [ "$source_path_used" = "yes" ]; then
echo "VPATH=$source_path" >> $config_mak echo "VPATH=$source_path" >> $config_mak

View File

@ -2202,7 +2202,7 @@ void cpu_loop (CPUState *env)
static void usage(void) 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" "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
"Linux CPU emulator (compiled for %s emulation)\n" "Linux CPU emulator (compiled for %s emulation)\n"
"\n" "\n"

View File

@ -273,7 +273,7 @@ static void do_info(Monitor *mon, const char *item)
static void do_info_version(Monitor *mon) 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) static void do_info_name(Monitor *mon)

2
vl.c
View File

@ -3942,7 +3942,7 @@ static int main_loop(void)
static void version(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) static void help(int exitcode)