Commit 1d5d9fbe authored by rgaudin's avatar rgaudin
Browse files

Updated master (less logs)

parent 8832c2af
......@@ -3,6 +3,7 @@
* Safer image sizes based on SD card sizes
* Disabled some logs on target system to increase SD card lifespan
* Updated Wikifundi language packs (2018-09-24)
* Added a Cache Folder Management tool
2.0-rc11
* Fixed an unmount issue on Linux
......
......@@ -7,13 +7,13 @@
"archive_size": 366646269,
"expanded_size": 1862270976
},
"pibox_base_image": {
"url": "{mirror}/plug/base/plug-master_2018-09-13.img.zip",
"name": "plug-master_2018-09-13.img.zip",
"hotspot_master_image": {
"url": "{mirror}/plug/base/hotspot-master_2018-09-24.img.zip",
"name": "hotspot-master_2018-09-24.img.zip",
"root_partition_size": 7000000000,
"checksum": "d5c47e22af01e5bee2ab7c4034ff6e62c651aea1f982b72129556f4230742b78",
"archive_size": 2938917221,
"expanded_size": 8000000000
"checksum": "aa23931981558e7e949fdf3ad08b069f8fd590353a4c226e80f38ea07e373d18",
"archive_size": 2616240405,
"expanded_size": 7760000000
},
"aflatoun_content": {
"url": "{mirror}/other/aflatoun/content.tar.gz",
......
......@@ -126,7 +126,7 @@ def reset_cache(logger, build_folder, cache_folder, **kwargs):
if kwargs.get("keep_master"):
master = get_content("pibox_base_image")
master = get_content("hotspot_master_image")
master_fpath = os.path.join(cache_folder, master["name"])
if (
os.path.exists(master_fpath)
......
......@@ -418,7 +418,7 @@ def get_expanded_size(collection):
def get_required_image_size(collection):
required_size = sum(
[
get_content("pibox_base_image").get("root_partition_size"),
get_content("hotspot_master_image").get("root_partition_size"),
get_expanded_size(collection),
]
)
......@@ -433,7 +433,7 @@ def get_required_building_space(collection, cache_folder, image_size=None):
# the master image
# we neglect the master's expanded size as it is going to be moved
# to the image path and resized in-place (never reduced)
base_image_size = get_content("pibox_base_image").get("archive_size")
base_image_size = get_content("hotspot_master_image").get("archive_size")
# the created image
if image_size is None:
......
......@@ -279,7 +279,7 @@ def get_virtual_device(image_fpath, logger):
if sys.platform == "linux":
# find out offset for third partition from the root part size
base_image = get_content("pibox_base_image")
base_image = get_content("hotspot_master_image")
disk_size = get_qemu_image_size(image_fpath, logger)
offset, size = get_start_offset(
base_image.get("root_partition_size"), disk_size
......
......@@ -297,7 +297,7 @@ try:
except FileNotFoundError as exp:
print("Supplied File Not Found: {}".format(exp.filename), file=sys.stderr)
sys.exit(1)
base_image_size = get_content("pibox_base_image")["expanded_size"]
base_image_size = get_content("hotspot_master_image")["expanded_size"]
if args.size < base_image_size:
print(
......
......@@ -1615,7 +1615,7 @@ class Application:
size = self.get_output_size()
validate_label(
self.component.size_combobox,
size >= get_content("pibox_base_image")["expanded_size"],
size >= get_content("hotspot_master_image")["expanded_size"],
)
for row in self.component.zim_list_store:
......
......@@ -148,7 +148,7 @@ def run_installation(
# Download Base image
logger.stage("master")
logger.step("Retrieving base image file")
base_image = get_content("pibox_base_image")
base_image = get_content("hotspot_master_image")
rf = download_content(base_image, logger, build_dir)
if not rf.successful:
logger.err("Failed to download base image.\n{e}".format(e=rf.exception))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment