From 3e1e76b94a754895e57de902fbf6353a91c6b563 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 3 Dec 2020 16:17:32 +0000 Subject: [PATCH] riscv64: fixup subarch build, unbound variable --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 2960fac0..080dab51 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -137,12 +137,12 @@ install_grub() { if [ -n "${SUBARCH:-}" ]; then chroot mountpoint apt-get install -qqy u-boot-sifive - dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot-spl.bin of=$loader1 - dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot.itb of=$loader2 # FSBL, which gets U-Boot SPL loader1="/dev/mapper${loop_device///dev/}p13" # The real U-Boot loader2="/dev/mapper${loop_device///dev/}p14" + dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot-spl.bin of=$loader1 + dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot.itb of=$loader2 # Provide end-user modifyable CIDATA cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}"