From 1f2b668d48144b11c8b89d4b684da60afb3e3f4a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 1 Feb 2015 14:22:14 +0100 Subject: [PATCH] bcm2835-bootloader: install dtbs only if avaible Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/release | 11 +++++++++-- packages/tools/bcm2835-bootloader/scripts/update.sh | 10 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/tools/bcm2835-bootloader/release b/packages/tools/bcm2835-bootloader/release index 39ec945f5f..973c275945 100755 --- a/packages/tools/bcm2835-bootloader/release +++ b/packages/tools/bcm2835-bootloader/release @@ -25,5 +25,12 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/3rdparty/bootloader/ cp -PR $BUILD/bcm2835-bootloader-*/fixup_x.dat $RELEASE_DIR/3rdparty/bootloader/fixup.dat cp -PR $BUILD/bcm2835-bootloader-*/start_x.elf $RELEASE_DIR/3rdparty/bootloader/start.elf - cp -PR $INSTALL/usr/share/bootloader/*.dtb $RELEASE_DIR/3rdparty/bootloader/ - cp -PR $INSTALL/usr/share/bootloader/overlays $RELEASE_DIR/3rdparty/bootloader/ \ No newline at end of file + + if [ -f $INSTALL/usr/share/bootloader/*.dtb ]; then + cp -PR $INSTALL/usr/share/bootloader/*.dtb $RELEASE_DIR/3rdparty/bootloader/ + fi + + if [ -f $INSTALL/usr/share/bootloader/overlays/*.dtb ]; then + mkdir -p $RELEASE_DIR/3rdparty/bootloader/overlays + cp -PR $INSTALL/usr/share/bootloader/overlays/*.dtb $RELEASE_DIR/3rdparty/bootloader/overlays + fi diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index 7054650000..8dcdb1f762 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -30,8 +30,14 @@ cp -p $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT - cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT - cp -pR $SYSTEM_ROOT/usr/share/bootloader/overlays $BOOT_ROOT + if [ -f $SYSTEM_ROOT/usr/share/bootloader/*.dtb ]; then + cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT + fi + + if [ -f $SYSTEM_ROOT/usr/share/bootloader/overlays/*.dtb ]; then + mkdir -p $BOOT_ROOT/overlays + cp -p $SYSTEM_ROOT/usr/share/bootloader/overlays/*.dtb $BOOT_ROOT/overlays + fi # cleanup not more needed files rm -rf $BOOT_ROOT/loader.bin