summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2009-07-03 22:20:05 +0200
committerRichard W.M. Jones <rjones@redhat.com>2009-07-04 15:27:56 +0100
commit22b787d17bf038d50b8f9a31db09c7de3a8f82eb (patch)
tree03432ab45eb6494573f84441d62278d58e060983
parent349814e9d912c4f372b8fbdfb10b03749911021f (diff)
downloadlibguestfs-22b787d17bf038d50b8f9a31db09c7de3a8f82eb.tar.gz
libguestfs-22b787d17bf038d50b8f9a31db09c7de3a8f82eb.tar.xz
libguestfs-22b787d17bf038d50b8f9a31db09c7de3a8f82eb.zip
select proper kernel by architecture
-rw-r--r--appliance/debian/debirf.conf.in2
-rw-r--r--configure.ac12
2 files changed, 13 insertions, 1 deletions
diff --git a/appliance/debian/debirf.conf.in b/appliance/debian/debirf.conf.in
index a3dc16fe..12506c55 100644
--- a/appliance/debian/debirf.conf.in
+++ b/appliance/debian/debirf.conf.in
@@ -1,5 +1,5 @@
DEBIRF_LABEL="debirf-libguestfs"
DEBIRF_SUITE=@REPO@
DEBIRF_MIRROR=@MIRROR@/${DEBIRF_DISTRO}
-DEBIRF_KERNEL_ARCH=486
+DEBIRF_KERNEL_ARCH=@DEBIAN_KERNEL_ARCH@
diff --git a/configure.ac b/configure.ac
index f0eba8a3..c70d104f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,18 @@ else
test "x$DEBIRF" = "xno" &&
AC_MSG_ERROR([debirf must be installed])
DIST="DEBIAN"
+ case $host_cpu in
+ *86)
+ DEBIAN_KERNEL_ARCH=486
+ ;;
+ x86_64)
+ DEBIAN_KERNEL_ARCH=amd64
+ ;;
+ *)
+ DEBIAN_KERNEL_ARCH=$host_cpu
+ ;;
+ esac
+ AC_SUBST(DEBIAN_KERNEL_ARCH)
fi
AC_SUBST(DIST)