From 24ed994bc1441fb1c754290e53674cd131bc4484 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 24 Jan 2013 03:02:31 +0100 Subject: [PATCH] bootusb, bootcd: x86_64 support --- platforms/bootcd/settings.inc | 15 ++++++++++++--- platforms/bootusb/settings.inc | 16 +++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/platforms/bootcd/settings.inc b/platforms/bootcd/settings.inc index d260f2d..cbef2a7 100644 --- a/platforms/bootcd/settings.inc +++ b/platforms/bootcd/settings.inc @@ -2,9 +2,18 @@ MEDIA=iso MULTITHREAD=1 DISTROMATIC=off -KERNEL_EXTRAVER=mamba -KERNEL_PLATFORM="" -#KERNEL_ADDITIONAL="extramodules" +if [ "$ARCH" = "i586" ]; then + KERNEL_EXTRAVER=mamba + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules" + #KERNEL_MORE_EXTRAVER=mamba-64GB +elif [ "$ARCH" = "x86_64" ]; then + KERNEL_EXTRAVER=mamba-x86_64 + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules" + #KERNEL_MORE_EXTRAVER= +fi + LIVECD_TARGETS="" TARGET_HOSTNAME=openmamba-livecd diff --git a/platforms/bootusb/settings.inc b/platforms/bootusb/settings.inc index 9834c2c..63a6f2a 100644 --- a/platforms/bootusb/settings.inc +++ b/platforms/bootusb/settings.inc @@ -2,11 +2,17 @@ MEDIA=cpio MULTITHREAD=1 DISTROMATIC=on -KERNEL_EXTRAVER=mamba -KERNEL_PLATFORM="" -#KERNEL_ADDITIONAL="extramodules wireless sound" - -KERNEL_MORE_EXTRAVER=mamba-64GB +if [ "$ARCH" = "i586" ]; then + KERNEL_EXTRAVER=mamba + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules" + KERNEL_MORE_EXTRAVER=mamba-64GB +elif [ "$ARCH" = "x86_64" ]; then + KERNEL_EXTRAVER=mamba-x86_64 + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules" + KERNEL_MORE_EXTRAVER= +fi RPMEXTRAARGS="--excludedocs"