Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test cauldron by Quentin Rameau (1d3280049da114a687950e5d875bda4ae8927d04)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Quentin Rameau <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test cauldron by Quentin Rameau (1d3280049da114a687950e5d875bda4ae8927d04)
  • Date: Fri, 9 Jan 2009 18:00:36 -0600

GIT changes to test cauldron by Quentin Rameau <quinq AT sourcemage.org>:

scripts/spellcaster.sh | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 1d3280049da114a687950e5d875bda4ae8927d04
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

scripts/spellcaster.sh: changed kernel image path

The path to the image kernel is tested against iso architecture to be
sure to
get the right kernel.

diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index a8ece42..464e414 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x

# this script handles automatically casting all required spells into the ISO
# chroot, and also the casting and subsequent dispelling (with caches
enabled)
@@ -313,9 +313,15 @@ function install_kernel() {
if [[ -e "$SRC"/boot/vmlinuz ]]
then
kernel="$SRC/boot/vmlinuz"
- elif [[ -e "$SRC"/usr/src/linux/arch/i386/boot/bzImage ]]
- then
- kernel="$SRC/usr/src/linux/arch/i386/boot/bzImage"
+ else
+ # Getting kernel architecture from ISO architecture
+ . $CAULDRONDIR/kernel_archs
+ kernel_arch=karch_$TYPE
+
+ if [[ -e
"$SRC"/usr/src/linux/arch/"${!kernel_arch:-${TYPE}}"/boot/bzImage ]]
+ then
+
kernel="$SRC/usr/src/linux/arch/${!kernel_arch:-${TYPE}}/boot/bzImage"
+ fi
fi
fi
if [[ -z $kernel ]]



  • [SM-Commit] GIT changes to test cauldron by Quentin Rameau (1d3280049da114a687950e5d875bda4ae8927d04), Quentin Rameau, 01/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page