mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: fixed c2 bundle format (#1889)

Browse Source 
* scripts: fixed c2 bundle format
* scripts: copro.py: small refactoring

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger 2022-10-18 16:13:28 +04:00 committed by GitHub
parent f61a8fda53
commit 4942bd2105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/flipper/assets/copro.py
View File

@ -3,6 +3,8 @@ import json
from io import BytesIO from io import BytesIO
import tarfile import tarfile
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
import posixpath
import os
from flipper.utils import * from flipper.utils import *
from flipper.assets.coprobin import CoproBinary, get_stack_type from flipper.assets.coprobin import CoproBinary, get_stack_type
@ -23,6 +25,8 @@ MANIFEST_TEMPLATE = {
class Copro: class Copro:
COPRO_TAR_DIR = "core2_firmware"
def __init__(self, mcu): def __init__(self, mcu):
self.mcu = mcu self.mcu = mcu
self.version = None self.version = None
@ -50,9 +54,8 @@ class Copro:
raise Exception(f"Unsupported cube version") raise Exception(f"Unsupported cube version")
self.version = cube_version self.version = cube_version
@staticmethod def _getFileName(self, name):
def _getFileName(name): return posixpath.join(self.COPRO_TAR_DIR, name)
return os.path.join("core2_firmware", name)
def addFile(self, array, filename, **kwargs): def addFile(self, array, filename, **kwargs):
source_file = os.path.join(self.mcu_copro, filename) source_file = os.path.join(self.mcu_copro, filename)
@ -61,6 +64,9 @@ class Copro:
def bundle(self, output_file, stack_file_name, stack_type, stack_addr=None): def bundle(self, output_file, stack_file_name, stack_type, stack_addr=None):
self.output_tar = tarfile.open(output_file, "w:gz", format=tarfile.USTAR_FORMAT) self.output_tar = tarfile.open(output_file, "w:gz", format=tarfile.USTAR_FORMAT)
fw_directory = tarfile.TarInfo(self.COPRO_TAR_DIR)
fw_directory.type = tarfile.DIRTYPE
self.output_tar.addfile(fw_directory)
stack_file = os.path.join(self.mcu_copro, stack_file_name) stack_file = os.path.join(self.mcu_copro, stack_file_name)
# Form Manifest # Form Manifest