From a8831734066ad9da5f002da32a9e281d3e00bcd4 Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Tue, 17 May 2011 01:27:45 -0600
Subject: [PATCH] reworking atv-bootloader build script to create a mach_kernel
 directly

---
 packages/tools/atv-bootloader/build | 11 ++++++++++-
 packages/tools/atv-bootloader/meta  |  4 ++--
 scripts/image_squashfs              | 12 ++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/tools/atv-bootloader/build b/packages/tools/atv-bootloader/build
index 522e4cef36..a0e651676f 100755
--- a/packages/tools/atv-bootloader/build
+++ b/packages/tools/atv-bootloader/build
@@ -22,9 +22,18 @@
 
 . config/options $1
 
+get_version
+
 cd $PKG_BUILD
 
-TOOLS_PREFIX=$(readlink -f ../)
+TOOLS_PREFIX="$ROOT/$BUILD"
 
 sed -i -e "s:/opt:$TOOLS_PREFIX:" Makefile
 
+cp -PR $ROOT/$BUILD/linux-*/arch/x86/boot/bzImage vmlinuz
+
+make clean
+make LDFLAGS=""
+
+cp -PR mach_kernel $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel
+chmod 0644 $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel
diff --git a/packages/tools/atv-bootloader/meta b/packages/tools/atv-bootloader/meta
index 1c0b9d48b1..62846e9fb7 100644
--- a/packages/tools/atv-bootloader/meta
+++ b/packages/tools/atv-bootloader/meta
@@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/atv-bootloader/"
 PKG_URL="http://travisghansen.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="darwin-cross"
-PKG_BUILD_DEPENDS=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="darwin-cross linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
 PKG_SHORTDESC="atv-bootloader: Tool to create a mach_kernel compaitible kernel image"
diff --git a/scripts/image_squashfs b/scripts/image_squashfs
index 03edaf095b..8488e0f0cd 100755
--- a/scripts/image_squashfs
+++ b/scripts/image_squashfs
@@ -46,18 +46,10 @@ mkdir -p $TARGET_IMG
     KERNEL_ARCH="arm"
   fi
 
+  cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel
+  
   if [ "$BOOTLOADER" = "atv-bootloader" ]; then
     $SCRIPTS/build atv-bootloader
-    echo "creating mach_kernel compatible kernel image"
-    cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $BUILD/atv-bootloader*
-    cd $BUILD/atv-bootloader*
-    mv $KERNEL_IMAGE vmlinuz
-    make clean
-    make LDFLAGS=""
-    cd -
-    cp -PR $BUILD/atv-bootloader*/mach_kernel $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel
-  else
-    cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel
   fi
 
   echo "rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system" >> $FAKEROOT_SCRIPT