From dd0d848b8fd21ba55ebff2ab2c60cd78aec56ec0 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Tue, 6 Sep 2022 03:05:38 +0200 Subject: [PATCH] image.cmd_build(): parse deviceinfo only after building the packages --- image.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/image.py b/image.py index 43f7c22..7c46bbc 100644 --- a/image.py +++ b/image.py @@ -397,13 +397,6 @@ def cmd_build(profile_name: str = None, flavour = get_flavour(profile_name) size_extra_mb: int = int(profile["size_extra_mb"]) - deviceinfo = device.parse_deviceinfo() - sector_size = deviceinfo.flash_pagesize - if not sector_size: - raise Exception(f"Device {device.name} has no flash_pagesize specified") - - rootfs_size_mb = FLAVOURS[flavour].get('size', 2) * 1000 - packages = BASE_PACKAGES + [device.package.name] + FLAVOURS[flavour]['packages'] + profile['pkgs_include'] if arch != config.runtime.arch: @@ -413,6 +406,13 @@ def cmd_build(profile_name: str = None, logging.info("Making sure all packages are built") build_packages_by_paths(packages, arch, try_download=not no_download_pkgs) + deviceinfo = device.parse_deviceinfo() + sector_size = deviceinfo.flash_pagesize + if not sector_size: + raise Exception(f"Device {device.name} has no flash_pagesize specified") + + rootfs_size_mb = FLAVOURS[flavour].get('size', 2) * 1000 + image_path = block_target or get_image_path(device, flavour) makedir(os.path.dirname(image_path))