Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion build/meta-bsp/classes/bsp.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,13 @@ addtask do_deploy_boot_chain before do_deploy
def __do_deploy_boot(d):

if d.getVar('IB_STORAGE_MODE') not in ("remote", "http"):
bb.warn("Now mounting")
# Make deploy depend on an initialised storage. In "soft" mode this
# creates sdcard.img.<platform> on the fly when it is missing (the
# same work as scripts/init_storage.sh), so a fresh tree can deploy
# without a separate manual init step. deploy.sh already opened a
# sudo session, so the losetup/mkfs done here via `sudo -n` succeeds.
__do_fs_check(d)
bb.plain("Mounting storage")
__do_fs_mount(d)

__do_platform_deploy(d)
Expand Down
8 changes: 7 additions & 1 deletion build/meta-filesystem/classes/fs_arm_common.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,13 @@ def __do_fs_mount(d):
os.stat(img_path)
except OSError as e:
if e.errno == errno.ENOENT:
bb.fatal(f"{img_path} does not exist")
bb.fatal(
f"Storage image '{img_path}' does not exist: the filesystem "
f"for platform '{IB_PLATFORM}' has not been initialised yet.\n"
f"Deploy normally creates it automatically; if you reach this, "
f"initialise the storage explicitly by running:\n"
f" ./scripts/init_storage.sh\n"
f"then run the deploy again.")

p1 = os.path.join(WORKDIR, "p1")
p2 = os.path.join(WORKDIR, "p2")
Expand Down
Loading