From 44041be3089f65f0c4292f91933ef21961152454 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 6 Mar 2013 10:36:28 +0100 Subject: [PATCH] livedvd, livedvd-root: x86_64 kernel support --- platforms/livedvd-root/settings.inc | 16 +++++++++++----- platforms/livedvd/settings.inc | 15 +++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/platforms/livedvd-root/settings.inc b/platforms/livedvd-root/settings.inc index 561ba4f..dcc84e5 100644 --- a/platforms/livedvd-root/settings.inc +++ b/platforms/livedvd-root/settings.inc @@ -2,11 +2,17 @@ PRODUCT_NAME=livedvd MEDIA=squash_xz MULTITHREAD=1 -KERNEL_EXTRAVER=mamba -KERNEL_PLATFORM="" -#KERNEL_ADDITIONAL="extramodules sound" - -KERNEL_MORE_EXTRAVER=mamba-64GB +if [ "$ARCH" = "i586" ]; then + KERNEL_EXTRAVER=mamba + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules sound" + KERNEL_MORE_EXTRAVER=mamba-64GB +elif [ "$ARCH" = "x86_64" ]; then + KERNEL_EXTRAVER=mamba-x86_64 + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="vboxvideo" + KERNEL_MORE_EXTRAVER= +fi TARGET_HOSTNAME=openmamba-livedvd ROOTDEV= diff --git a/platforms/livedvd/settings.inc b/platforms/livedvd/settings.inc index 7912a70..c4feb19 100644 --- a/platforms/livedvd/settings.inc +++ b/platforms/livedvd/settings.inc @@ -1,11 +1,18 @@ MEDIA=iso MULTITHREAD=1 DISTROMATIC=off -KERNEL_EXTRAVER=mamba -KERNEL_PLATFORM="" -#KERNEL_ADDITIONAL="extramodules" -KERNEL_MORE_EXTRAVER=mamba-64GB +if [ "$ARCH" = "i586" ]; then + KERNEL_EXTRAVER=mamba + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="vboxvideo" + KERNEL_MORE_EXTRAVER=mamba-64GB +elif [ "$ARCH" = "x86_64" ]; then + KERNEL_EXTRAVER=mamba-x86_64 + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="vboxvideo" + KERNEL_MORE_EXTRAVER= +fi [ "$SUBPLATFORM" ] || { SUBPLATFORM="livedvd-root"