summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-07-16 14:16:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:08:48 +0100
commitf6f243bff4fa7c0e876a506a7013c86e0141556c (patch)
tree20bc843e74019e7bf266be9c674d85466e094bed /scripts
parentb0c86d8149dffd72d0dbd2451031f30953e36dc7 (diff)
downloadopenembedded-core-f6f243bff4fa7c0e876a506a7013c86e0141556c.tar.gz
openembedded-core-f6f243bff4fa7c0e876a506a7013c86e0141556c.tar.bz2
openembedded-core-f6f243bff4fa7c0e876a506a7013c86e0141556c.zip
mkefidisk.sh: Copy the EFI dir recursively
Rather than only copying the EFI/BOOT dir, copy the entire EFI dir recursively. This allows for custom configurations to be enabled implicitly with no extra work required. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/mkefidisk.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 9b130416a1..98c43f5d87 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -264,11 +264,9 @@ umount $HDDIMG_ROOTFS_MNT
echo "Preparing boot partition..."
EFIDIR="$BOOTFS_MNT/EFI/BOOT"
-mkdir -p $EFIDIR
-
cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT
# Copy the efi loader and configs (booti*.efi and grub.cfg if it exists)
-cp $HDDIMG_MNT/EFI/BOOT/* $EFIDIR
+cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT
# Silently ignore a missing gummiboot loader dir (we might just be a GRUB image)
cp -r $HDDIMG_MNT/loader $BOOTFS_MNT 2> /dev/null