From 1622e8a0859585e37d4f5700f07863f0228221fc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 17 May 2012 13:29:00 +0200
Subject: [PATCH] tools/mkpkg/mkpkg_bcm2835-driver: create 'bcm2835-bootloader'
 package

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 tools/mkpkg/mkpkg_bcm2835-bootloader | 44 ----------------------------
 tools/mkpkg/mkpkg_bcm2835-driver     |  9 +++++-
 2 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100755 tools/mkpkg/mkpkg_bcm2835-bootloader

diff --git a/tools/mkpkg/mkpkg_bcm2835-bootloader b/tools/mkpkg/mkpkg_bcm2835-bootloader
deleted file mode 100755
index 127da27b1c..0000000000
--- a/tools/mkpkg/mkpkg_bcm2835-bootloader
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d bcm2835-bootloader.git ]; then
-    git clone git://github.com/raspberrypi/tools.git bcm2835-bootloader.git
-  fi
-
-  cd bcm2835-bootloader.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf bcm2835-bootloader-$GIT_REV
-  cp -R bcm2835-bootloader.git bcm2835-bootloader-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf bcm2835-bootloader-$GIT_REV/.git
-  rm -rf bcm2835-bootloader-$GIT_REV/arm-bcm2708
-
-echo "packing sources..."
-  tar cvJf bcm2835-bootloader-$GIT_REV.tar.xz bcm2835-bootloader-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf bcm2835-bootloader-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_bcm2835-driver b/tools/mkpkg/mkpkg_bcm2835-driver
index c64c1deec2..3b62d52b94 100755
--- a/tools/mkpkg/mkpkg_bcm2835-driver
+++ b/tools/mkpkg/mkpkg_bcm2835-driver
@@ -33,6 +33,9 @@ echo "copying sources..."
   rm -rf bcm2835-driver-$GIT_REV
   cp -R bcm2835-driver.git bcm2835-driver-$GIT_REV
 
+  rm -rf bcm2835-bootloader-$GIT_REV
+  cp -R bcm2835-driver.git/boot bcm2835-bootloader-$GIT_REV
+
 echo "cleaning sources..."
   rm -rf bcm2835-driver-$GIT_REV/.git
   mkdir bcm2835-driver-$GIT_REV/softfp
@@ -41,12 +44,16 @@ echo "cleaning sources..."
   rm -rf bcm2835-driver-$GIT_REV/debug
   rm -rf bcm2835-driver-$GIT_REV/extra
   rm -rf bcm2835-driver-$GIT_REV/modules
-  rm -rf bcm2835-driver-$GIT_REV/boot/kernel*.img
+  rm -rf bcm2835-driver-$GIT_REV/boot
 
   chmod 644 bcm2835-driver-$GIT_REV/*/opt/vc/include/bcm_host.h
 
+  rm -rf bcm2835-bootloader-$GIT_REV/kernel*.img
+
 echo "packing sources..."
   tar cvJf bcm2835-driver-$GIT_REV.tar.xz bcm2835-driver-$GIT_REV
+  tar cvJf bcm2835-bootloader-$GIT_REV.tar.xz bcm2835-bootloader-$GIT_REV
 
 echo "remove temporary sourcedir..."
   rm -rf bcm2835-driver-$GIT_REV
+  rm -rf bcm2835-bootloader-$GIT_REV