From 035839232c1e5e4f481eb4fa54b73eb36cf18858 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 17 Jan 2010 00:15:08 +0000
Subject: [PATCH] Define the path to the kernel higher up in the variables list

---
 src/deforaos-build.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/deforaos-build.sh b/src/deforaos-build.sh
index 0198bb1..9056240 100755
--- a/src/deforaos-build.sh
+++ b/src/deforaos-build.sh
@@ -19,6 +19,8 @@ esac
 DESTDIR="/var/www/htdocs/download/snapshots"
 DEVNULL="/dev/null"
 FILE="DeforaOS-daily.iso"
+KERNEL_VERSION="2.4.37.7"
+KERNEL_PATH="/usr/src/linux-$KERNEL_VERSION"
 MODULE="DeforaOS"
 PREFIX="/usr"
 SRC="$HOME/build/$OS-$ARCH"
@@ -80,14 +82,14 @@ echo ""
 echo "Creating CD-ROM image:"
 ./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
 		IMAGE_TYPE="ramdisk" IMAGE_FILE="initrd.img" IMAGE_SIZE=8192 \
-		IMAGE_MODULES="/usr/src/linux-2.4.37/modules-ramdisk.tgz" \
+		IMAGE_MODULES="$KERNEL_PATH/modules-ramdisk.tgz" \
 		image						|| error
 $RM -r "$DST"
 ./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
 		IMAGE_TYPE="iso" \
 		IMAGE_FILE="DeforaOS-daily.iso" \
-		IMAGE_KERNEL="/usr/src/linux-2.4.37/arch/i386/boot/bzImage" \
-		IMAGE_MODULES="/usr/src/linux-2.4.37/modules.tgz" \
+		IMAGE_KERNEL="$KERNEL_PATH/arch/i386/boot/bzImage" \
+		IMAGE_MODULES="$KERNEL_PATH/modules.tgz" \
 		IMAGE_RAMDISK="initrd.img" \
 		KERNEL_ARGS="vga=0x301 rw" \
 		image						|| error