Changeset 47

Show
Ignore:
Timestamp:
04/23/10 10:48:10 (7 years ago)
Author:
csong
Message:

Modified configure and Makefile to make the installation less confusion.

Location:
virtualization/qebek/trunk
Files:
3 modified
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • virtualization/qebek/trunk/Makefile

    r39 r47  
    2121endif 
    2222ifdef BUILD_DOCS 
    23 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 
     23DOCS=qemu-doc.html qemu-tech.html qebek.1 qemu-img.1 
    2424else 
    2525DOCS= 
    … …  
    215215        texi2dvi $< 
    216216 
    217 qemu.1: qemu-doc.texi 
     217qebek.1: qemu-doc.texi 
    218218        $(SRC_PATH)/texi2pod.pl $< qemu.pod 
    219219        pod2man --section=1 --center=" " --release=" " qemu.pod > $@ 
    … …  
    229229html: qemu-doc.html qemu-tech.html 
    230230 
    231 QEBEK_VERSION ?= $(shell cat QEBEK_VERSION) 
    232 FILE = qebek-$(QEBEK_VERSION) 
     231VERSION ?= $(shell cat VERSION) 
     232FILE = qebek-$(VERSION) 
    233233 
    234234# tar release (use 'make -k tar' on a checkouted tree) 

  • virtualization/qebek/trunk/configure

    r39 r47  
    11#!/bin/sh 
    22# 
     3# qebek configure script (c) 2010 Chengyu Song 
     4# based on 
    35# qemu configure script (c) 2003 Fabrice Bellard 
    46# 
    … …  
    3537  i386|i486|i586|i686|i86pc|BePC) 
    3638    cpu="i386" 
    37   ;; 
    38   armv*b) 
    39     cpu="armv4b" 
    40   ;; 
    41   armv*l) 
    42     cpu="armv4l" 
    43   ;; 
    44   alpha) 
    45     cpu="alpha" 
    46   ;; 
    47   "Power Macintosh"|ppc|ppc64) 
    48     cpu="powerpc" 
    49   ;; 
    50   mips) 
    51     cpu="mips" 
    52   ;; 
    53   mips64) 
    54     cpu="mips64" 
    55   ;; 
    56   cris) 
    57     cpu="cris" 
    58   ;; 
    59   s390*) 
    60     cpu="s390" 
    61   ;; 
    62   sparc|sun4[cdmuv]) 
    63     cpu="sparc" 
    64   ;; 
    65   sparc64) 
    66     cpu="sparc64" 
    67   ;; 
    68   ia64) 
    69     cpu="ia64" 
    70   ;; 
    71   m68k) 
    72     cpu="m68k" 
    7339  ;; 
    7440  x86_64|amd64) 
    … …  
    277243  --enable-adlib) adlib="yes" 
    278244  ;; 
    279   --disable-kqemu) kqemu="no" 
    280   ;; 
     245  #--disable-kqemu) kqemu="no" 
     246  #;; 
    281247  --enable-profiler) profiler="yes" 
    282248  ;; 
    … …  
    387353#echo "  --target-list=LIST       set target list [$target_list]" 
    388354#echo "" 
    389 echo "kqemu kernel acceleration support:" 
    390 echo "  --disable-kqemu          disable kqemu support" 
     355#echo "kqemu kernel acceleration support:" 
     356#echo "  --disable-kqemu          disable kqemu support" 
    391357echo "" 
    392358echo "Advanced options (experts only):" 
    … …  
    523489# these targets are portable 
    524490    if [ "$softmmu" = "yes" ] ; then 
    525         target_list="i386-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu arm-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu m68k-softmmu sh4-softmmu sh4eb-softmmu cris-softmmu" 
     491        target_list="i386-softmmu x86_64-softmmu" 
    526492    fi 
    527493# the following are Linux specific 
    528494    if [ "$linux_user" = "yes" ] ; then 
    529         target_list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user sparc64-linux-user sparc32plus-linux-user mips-linux-user mipsel-linux-user m68k-linux-user alpha-linux-user sh4-linux-user sh4eb-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user x86_64-linux-user cris-linux-user $target_list" 
     495        target_list="i386-linux-user x86_64-linux-user $target_list" 
    530496    fi 
    531497# the following are Darwin specific 
    … …  
    539505# only i386 now 
    540506target_list="i386-softmmu" 
     507 
     508# no kqemu support now 
     509kqemu="no" 
    541510 
    542511if test -z "$target_list" ; then 
    … …  
    798767  echo "ARCH=x86_64" >> $config_mak 
    799768  echo "#define HOST_X86_64 1" >> $config_h 
    800 elif test "$cpu" = "armv4b" ; then 
    801   echo "ARCH=arm" >> $config_mak 
    802   echo "#define HOST_ARM 1" >> $config_h 
    803 elif test "$cpu" = "armv4l" ; then 
    804   echo "ARCH=arm" >> $config_mak 
    805   echo "#define HOST_ARM 1" >> $config_h 
    806 elif test "$cpu" = "powerpc" ; then 
    807   echo "ARCH=ppc" >> $config_mak 
    808   echo "#define HOST_PPC 1" >> $config_h 
    809 elif test "$cpu" = "mips" ; then 
    810   echo "ARCH=mips" >> $config_mak 
    811   echo "#define HOST_MIPS 1" >> $config_h 
    812 elif test "$cpu" = "mips64" ; then 
    813   echo "ARCH=mips64" >> $config_mak 
    814   echo "#define HOST_MIPS64 1" >> $config_h 
    815 elif test "$cpu" = "cris" ; then 
    816   echo "ARCH=cris" >> $config_mak 
    817   echo "#define HOST_CRIS 1" >> $config_h 
    818 elif test "$cpu" = "s390" ; then 
    819   echo "ARCH=s390" >> $config_mak 
    820   echo "#define HOST_S390 1" >> $config_h 
    821 elif test "$cpu" = "alpha" ; then 
    822   echo "ARCH=alpha" >> $config_mak 
    823   echo "#define HOST_ALPHA 1" >> $config_h 
    824 elif test "$cpu" = "sparc" ; then 
    825   echo "ARCH=sparc" >> $config_mak 
    826   echo "#define HOST_SPARC 1" >> $config_h 
    827 elif test "$cpu" = "sparc64" ; then 
    828   echo "ARCH=sparc64" >> $config_mak 
    829   echo "#define HOST_SPARC64 1" >> $config_h 
    830 elif test "$cpu" = "ia64" ; then 
    831   echo "ARCH=ia64" >> $config_mak 
    832   echo "#define HOST_IA64 1" >> $config_h 
    833 elif test "$cpu" = "m68k" ; then 
    834   echo "ARCH=m68k" >> $config_mak 
    835   echo "#define HOST_M68K 1" >> $config_h 
    836769else 
    837770  echo "Unsupported CPU = $cpu" 
    … …  
    922855  echo "#define CONFIG_VNC_TLS 1" >> $config_h 
    923856fi 
    924 qemu_version=`head $source_path/VERSION` 
    925 echo "VERSION=$qemu_version" >>$config_mak 
     857qemu_version=`head $source_path/QEMU_VERSION` 
     858echo "QEMU_VERSION=$qemu_version" >>$config_mak 
    926859echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h 
    927 qebek_version=`head $source_path/QEBEK_VERSION` 
    928 echo "#define QEBEK_VERSION \"$qebek_version\"" >> $config_h 
     860qebek_version=`head $source_path/VERSION` 
     861echo "VERSION=$qebek_version" >> $config_mak 
     862echo "#define VERSION \"$qebek_version\"" >> $config_h 
    929863 
    930864echo "SRC_PATH=$source_path" >> $config_mak 
    … …  
    1062996    echo "#define USE_KQEMU 1" >> $config_h 
    1063997  fi 
    1064 elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then 
    1065   echo "TARGET_ARCH=arm" >> $config_mak 
    1066   echo "#define TARGET_ARCH \"arm\"" >> $config_h 
    1067   echo "#define TARGET_ARM 1" >> $config_h 
    1068   bflt="yes" 
    1069 elif test "$target_cpu" = "sparc" ; then 
    1070   echo "TARGET_ARCH=sparc" >> $config_mak 
    1071   echo "#define TARGET_ARCH \"sparc\"" >> $config_h 
    1072   echo "#define TARGET_SPARC 1" >> $config_h 
    1073 elif test "$target_cpu" = "sparc64" ; then 
    1074   echo "TARGET_ARCH=sparc64" >> $config_mak 
    1075   echo "#define TARGET_ARCH \"sparc64\"" >> $config_h 
    1076   echo "#define TARGET_SPARC 1" >> $config_h 
    1077   echo "#define TARGET_SPARC64 1" >> $config_h 
    1078   elfload32="yes" 
    1079 elif test "$target_cpu" = "sparc32plus" ; then 
    1080   echo "TARGET_ARCH=sparc64" >> $config_mak 
    1081   echo "TARGET_ABI_DIR=sparc" >> $config_mak 
    1082   echo "TARGET_ARCH2=sparc32plus" >> $config_mak 
    1083   echo "#define TARGET_ARCH \"sparc64\"" >> $config_h 
    1084   echo "#define TARGET_SPARC 1" >> $config_h 
    1085   echo "#define TARGET_SPARC64 1" >> $config_h 
    1086   echo "#define TARGET_ABI32 1" >> $config_h 
    1087 elif test "$target_cpu" = "ppc" ; then 
    1088   echo "TARGET_ARCH=ppc" >> $config_mak 
    1089   echo "#define TARGET_ARCH \"ppc\"" >> $config_h 
    1090   echo "#define TARGET_PPC 1" >> $config_h 
    1091 elif test "$target_cpu" = "ppcemb" ; then 
    1092   echo "TARGET_ARCH=ppcemb" >> $config_mak 
    1093   echo "TARGET_ABI_DIR=ppc" >> $config_mak 
    1094   echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h 
    1095   echo "#define TARGET_PPC 1" >> $config_h 
    1096   echo "#define TARGET_PPCEMB 1" >> $config_h 
    1097 elif test "$target_cpu" = "ppc64" ; then 
    1098   echo "TARGET_ARCH=ppc64" >> $config_mak 
    1099   echo "TARGET_ABI_DIR=ppc" >> $config_mak 
    1100   echo "#define TARGET_ARCH \"ppc64\"" >> $config_h 
    1101   echo "#define TARGET_PPC 1" >> $config_h 
    1102   echo "#define TARGET_PPC64 1" >> $config_h 
    1103 elif test "$target_cpu" = "ppc64abi32" ; then 
    1104   echo "TARGET_ARCH=ppc64" >> $config_mak 
    1105   echo "TARGET_ABI_DIR=ppc" >> $config_mak 
    1106   echo "TARGET_ARCH2=ppc64abi32" >> $config_mak 
    1107   echo "#define TARGET_ARCH \"ppc64\"" >> $config_h 
    1108   echo "#define TARGET_PPC 1" >> $config_h 
    1109   echo "#define TARGET_PPC64 1" >> $config_h 
    1110   echo "#define TARGET_ABI32 1" >> $config_h 
    1111998elif test "$target_cpu" = "x86_64" ; then 
    1112999  echo "TARGET_ARCH=x86_64" >> $config_mak 
    … …  
    11171004    echo "#define USE_KQEMU 1" >> $config_h 
    11181005  fi 
    1119 elif test "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" ; then 
    1120   echo "TARGET_ARCH=mips" >> $config_mak 
    1121   echo "#define TARGET_ARCH \"mips\"" >> $config_h 
    1122   echo "#define TARGET_MIPS 1" >> $config_h 
    1123   echo "#define TARGET_ABI_MIPSO32 1" >> $config_h 
    1124 elif test "$target_cpu" = "mipsn32" -o "$target_cpu" = "mipsn32el" ; then 
    1125   echo "TARGET_ARCH=mipsn32" >> $config_mak 
    1126   echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h 
    1127   echo "#define TARGET_MIPS 1" >> $config_h 
    1128   echo "#define TARGET_ABI_MIPSN32 1" >> $config_h 
    1129 elif test "$target_cpu" = "mips64" -o "$target_cpu" = "mips64el" ; then 
    1130   echo "TARGET_ARCH=mips64" >> $config_mak 
    1131   echo "#define TARGET_ARCH \"mips64\"" >> $config_h 
    1132   echo "#define TARGET_MIPS 1" >> $config_h 
    1133   echo "#define TARGET_MIPS64 1" >> $config_h 
    1134   echo "#define TARGET_ABI_MIPSN64 1" >> $config_h 
    1135 elif test "$target_cpu" = "cris" ; then 
    1136   echo "TARGET_ARCH=cris" >> $config_mak 
    1137   echo "#define TARGET_ARCH \"cris\"" >> $config_h 
    1138   echo "#define TARGET_CRIS 1" >> $config_h 
    1139   echo "CONFIG_SOFTFLOAT=yes" >> $config_mak 
    1140   echo "#define CONFIG_SOFTFLOAT 1" >> $config_h 
    1141 elif test "$target_cpu" = "sh4" -o "$target_cpu" = "sh4eb" ; then 
    1142   echo "TARGET_ARCH=sh4" >> $config_mak 
    1143   echo "#define TARGET_ARCH \"sh4\"" >> $config_h 
    1144   echo "#define TARGET_SH4 1" >> $config_h 
    1145   bflt="yes" 
    1146 elif test "$target_cpu" = "m68k" ; then 
    1147   echo "TARGET_ARCH=m68k" >> $config_mak 
    1148   echo "#define TARGET_ARCH \"m68k\"" >> $config_h 
    1149   echo "#define TARGET_M68K 1" >> $config_h 
    1150   bflt="yes" 
    1151 elif test "$target_cpu" = "alpha" ; then 
    1152   echo "TARGET_ARCH=alpha" >> $config_mak 
    1153   echo "#define TARGET_ARCH \"alpha\"" >> $config_h 
    1154   echo "#define TARGET_ALPHA 1" >> $config_h 
    11551006else 
    11561007  echo "Unsupported target CPU" 

  • virtualization/qebek/trunk/vl.c

    r42 r47  
    74947494static void help(int exitcode) 
    74957495{ 
    7496     printf("QEBEK High Interaction Honeypot Monitor version " QEBEK_VERSION ", Copyright (c) 2009 Chengyu Song\n" 
     7496    printf("QEBEK High Interaction Honeypot Monitor version " VERSION ", Copyright (c) 2010 Chengyu Song\n" 
    74977497           "Based on QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n" 
    74987498           "usage: %s [options] [disk_image]\n"