Import Mbed OS hard-float snapshot
This commit is contained in:
Beslan
57
tools/importer/README.md
Normal file
57
tools/importer/README.md
Normal file
@@ -0,0 +1,57 @@
|
||||
## Importing repositories into mbed-os
|
||||
|
||||
importer.py script can be used to import code base from different repositories into mbed-os.
|
||||
|
||||
### Pre-requisties
|
||||
1. Get the required repository clone and update it to commit required - the recommended would be to checkout the latest release version in the repository that we are getting an update from.
|
||||
Note: Repository should be placed outside the mbed-os. For instance [CMSIS_5](https://github.com/ARM-software/CMSIS_5) repository would be at the same level as mbed-os repository (`update/mbed-os` and update/CMSIS_5)
|
||||
2. Create json file as per template
|
||||
|
||||
### JSON file template
|
||||
|
||||
You can list all the files and folders which are required to be copied in config file in `file` and `folder` arrays respectively. Script will remove the files/folders specified in `src` section from mbed-os repository before copy operation is performed.
|
||||
New commit is created on branch `feature_+repo_name+last_sha` with commit message "[REPO_NAME]: Updated to last_sha"
|
||||
|
||||
Note: Only files present in folder will be copied, directories inside the folder will not be copied.
|
||||
|
||||
`commit_sha` is list of commits present in mbed-os repo. They are used to be on top of the update - we are changing the upstream repository. To illustrate, the upstream repository does not contain Mbed OS specific change. To apply this change for every update, we add this commit SHA to the `commit_sha`. Every update we do, will use this sha and apply it on top of the latest update. Each commit in the commit_sha list is cherry-picked and applied with the -x option, which records the SHA of the source commit in the commit message.
|
||||
Note: You must resolve any conflicts that arise during this cherry-pick process. Make sure that the "(cherry picked from commit ...)" statement is present in the commit message. After the conflict resolution, continue with the cherry pick. Once done, just re-execute the python script to apply rest of the SHA commits.
|
||||
|
||||
```json
|
||||
{
|
||||
"files" : [
|
||||
{
|
||||
"src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c",
|
||||
"dest_file" : "cmsis/TARGET_CORTEX_M/mbed_tz_context.c"
|
||||
},
|
||||
...
|
||||
{
|
||||
"src_file" : "",
|
||||
"dest_file" : ""
|
||||
}
|
||||
],
|
||||
"folders" : [
|
||||
{
|
||||
"src_folder" : "CMSIS/Core/Include/",
|
||||
"dest_folder" : "cmsis/TARGET_CORTEX_M/"
|
||||
},
|
||||
...
|
||||
{
|
||||
"src_folder" : "",
|
||||
"dest_folder" : ""
|
||||
}
|
||||
],
|
||||
"commit_sha" : [
|
||||
"428acae1b2ac15c3ad523e8d40755a9301220822",
|
||||
{"sha": "d9d622afe0ca8c7ab9d24c17f9fe59b54dcc61c9", "msg": "Fix ..."}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
### Input to importer.py
|
||||
1. Repository: -r <repo_path> ( Example: CMSIS / Mbed-tls)
|
||||
2. `repo`_importer.json: -c <json_file> (Example: cmsis_importer.json)
|
||||
|
||||
For example the command below can be used to update CMSIS:
|
||||
`python tools\importer\importer.py -c tools\importer\cmsis_importer.json -r <path to cmsis repo>`
|
||||
|
||||
158
tools/importer/cmsis_importer.json
Normal file
158
tools/importer/cmsis_importer.json
Normal file
@@ -0,0 +1,158 @@
|
||||
{
|
||||
"files" : [
|
||||
{
|
||||
"src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c",
|
||||
"dest_file" : "cmsis/TARGET_CORTEX_M/mbed_tz_context.c"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Config/handlers.c",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.h",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.c",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mbl.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm3.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mml.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm4f.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_ca.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mbl.S",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm3.S",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mml.S",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm4f.S",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_ca.S",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_common.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_common.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm4f.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/Source/os_systick.c",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/Source/os_systick.c"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_ca.s",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S"
|
||||
},
|
||||
{
|
||||
"src_file" : "CMSIS/RTOS2/RTX/Library/cmsis_os1.c",
|
||||
"dest_file" : "rtos/source/TARGET_CORTEX/rtx4/cmsis_os1.c"
|
||||
}
|
||||
],
|
||||
"folders" : [
|
||||
{
|
||||
"src_folder" : "CMSIS/Core/Include/",
|
||||
"dest_folder" : "cmsis/TARGET_CORTEX_M/"
|
||||
},
|
||||
{
|
||||
"src_folder" : "CMSIS/RTOS2/Include/",
|
||||
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/Include/"
|
||||
},
|
||||
{
|
||||
"src_folder" : "CMSIS/RTOS2/RTX/Include1/",
|
||||
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx4/"
|
||||
},
|
||||
{
|
||||
"src_folder" : "CMSIS/RTOS2/RTX/Include/",
|
||||
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Include/"
|
||||
},
|
||||
{
|
||||
"src_folder" : "CMSIS/RTOS2/RTX/Source/",
|
||||
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/"
|
||||
},
|
||||
{
|
||||
"src_folder" : "CMSIS/RTOS2/RTX/Source/",
|
||||
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/"
|
||||
},
|
||||
{
|
||||
"src_folder" : "CMSIS/Core_A/Include/",
|
||||
"dest_folder" : "cmsis/TARGET_CORTEX_A/"
|
||||
},
|
||||
{
|
||||
"src_folder" : "CMSIS/Core_A/Source/",
|
||||
"dest_folder" : "cmsis/TARGET_CORTEX_A/"
|
||||
}
|
||||
],
|
||||
"commit_sha" : [
|
||||
"4360b7bbf815c4d812005938c9c27af199803a97",
|
||||
"6a6e3ac0ebab1a6b6aa08d0928702c79562acee9",
|
||||
"fb354752eb69403ad503c8e53da67da6483776d6",
|
||||
"d3f7abdb7c109517e6a71daed8bae63ad6436afc",
|
||||
"08ab8cc47d8722bf0c767990cd615cf1c427d006",
|
||||
"dd21ea0ae0559f148d3ff5b1a1937f9d7e0e1138",
|
||||
"9549fff786475bdcd6ab1d8ac8db1c8618c19f6f",
|
||||
"96e0689204d375e23bf69d7787a18ba07182f085",
|
||||
"7149ffed11c0ef6a16f8808f12b7aca16921a66a"
|
||||
]
|
||||
}
|
||||
|
||||
337
tools/importer/importer.py
Normal file
337
tools/importer/importer.py
Normal file
@@ -0,0 +1,337 @@
|
||||
#!/usr/bin/python
|
||||
"""
|
||||
Copyright (c) 2017-2019 ARM Limited. All rights reserved.
|
||||
|
||||
SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
"""
|
||||
|
||||
import os
|
||||
import json
|
||||
import sys
|
||||
import subprocess
|
||||
import logging
|
||||
import argparse
|
||||
import re
|
||||
from os.path import dirname, abspath, join, isfile, normpath
|
||||
|
||||
# Be sure that the tools directory is in the search path
|
||||
ROOT = abspath(join(dirname(__file__), os.path.pardir, os.path.pardir))
|
||||
sys.path.insert(0, ROOT)
|
||||
|
||||
from tools.utils import delete_dir_files, mkdir, copy_file
|
||||
|
||||
rel_log = logging.getLogger("Importer")
|
||||
|
||||
|
||||
class StoreDir(argparse.Action):
|
||||
def __call__(self, parser, namespace, values, option_string=None):
|
||||
directory = abspath(values)
|
||||
if not os.path.isdir(directory):
|
||||
raise argparse.ArgumentError(
|
||||
None, "The directory %s does not exist!" % directory)
|
||||
setattr(namespace, self.dest, directory)
|
||||
|
||||
|
||||
class SetLogLevel(argparse.Action):
|
||||
def __call__(self, parser, namespace, values, option_string=None):
|
||||
logging.basicConfig(level=values)
|
||||
|
||||
|
||||
class DirContext(object):
|
||||
def __init__(self, dir):
|
||||
self.dir = dir
|
||||
|
||||
def __enter__(self):
|
||||
_backup_dir = os.getcwd()
|
||||
os.chdir(self.dir)
|
||||
self.dir = _backup_dir
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc_val, exc_tb):
|
||||
os.chdir(self.dir)
|
||||
|
||||
|
||||
def del_file(name):
|
||||
"""
|
||||
Delete the file in RTOS/CMSIS/features directory of mbed-os.
|
||||
|
||||
:param name: Name of the file.
|
||||
:return: None.
|
||||
"""
|
||||
|
||||
result = []
|
||||
search_path = [join(ROOT, 'rtos'), join(ROOT, 'cmsis'),
|
||||
join(ROOT, 'features')]
|
||||
for path in search_path:
|
||||
for root, dirs, files in os.walk(path):
|
||||
if name in files:
|
||||
result.append(join(root, name))
|
||||
for f in result:
|
||||
os.remove(f)
|
||||
rel_log.debug("Deleted %s", os.path.relpath(f, ROOT))
|
||||
|
||||
|
||||
def copy_folder(src, dst):
|
||||
"""
|
||||
Copy contents of folder in mbed-os listed path.
|
||||
|
||||
:param src: Source folder path.
|
||||
:param dst: Destination folder path.
|
||||
:return: None.
|
||||
"""
|
||||
|
||||
files = os.listdir(src)
|
||||
for f in files:
|
||||
abs_src_file = join(src, f)
|
||||
if isfile(abs_src_file):
|
||||
abs_dst_file = join(dst, f)
|
||||
mkdir(dirname(abs_dst_file))
|
||||
copy_file(abs_src_file, abs_dst_file)
|
||||
|
||||
|
||||
def import_files(repo_path, data_files, data_folders):
|
||||
"""
|
||||
Imports files and directories to mbed-os
|
||||
|
||||
:param repo_path: Path to the repo copying from.
|
||||
:param data_files: List of files to be copied. (with destination)
|
||||
:param data_folders: List of directories to be copied. (with destination)
|
||||
:return: None
|
||||
"""
|
||||
|
||||
# Remove all files listed in .json from mbed-os repo to avoid duplications
|
||||
for fh in data_files:
|
||||
src_file = fh['src_file']
|
||||
del_file(os.path.basename(src_file))
|
||||
dest_file = join(ROOT, fh['dest_file'])
|
||||
if isfile(dest_file):
|
||||
os.remove(join(ROOT, dest_file))
|
||||
rel_log.debug("Deleted %s", fh['dest_file'])
|
||||
for folder in data_folders:
|
||||
dest_folder = folder['dest_folder']
|
||||
delete_dir_files(dest_folder)
|
||||
rel_log.debug("Deleted: %s", folder['dest_folder'])
|
||||
rel_log.info("Removed files/folders listed in json file")
|
||||
|
||||
# Copy all the files listed in json file to mbed-os
|
||||
for fh in data_files:
|
||||
repo_file = join(repo_path, fh['src_file'])
|
||||
mbed_path = join(ROOT, fh['dest_file'])
|
||||
mkdir(dirname(mbed_path))
|
||||
copy_file(repo_file, mbed_path)
|
||||
rel_log.debug("Copied %s to %s", normpath(repo_file),
|
||||
normpath(mbed_path))
|
||||
for folder in data_folders:
|
||||
repo_folder = join(repo_path, folder['src_folder'])
|
||||
mbed_path = join(ROOT, folder['dest_folder'])
|
||||
copy_folder(repo_folder, mbed_path)
|
||||
rel_log.debug("Copied %s to %s", normpath(repo_folder),
|
||||
normpath(mbed_path))
|
||||
|
||||
|
||||
def run_cmd_with_output(command, exit_on_failure=False):
|
||||
"""
|
||||
Passes a command to the system and returns a True/False result once the
|
||||
command has been executed, indicating success/failure. If the command was
|
||||
successful then the output from the command is returned to the caller.
|
||||
Commands are passed as a list of tokens.
|
||||
E.g. The command 'git remote -v' would be passed in as:
|
||||
['git', 'remote', '-v']
|
||||
|
||||
:param command: System command as a list of tokens.
|
||||
:param exit_on_failure: Exit the program on failure (default=False)
|
||||
:return: Command return status code and output as tuple.
|
||||
"""
|
||||
|
||||
rel_log.debug('[Exec] %s', ' '.join(command))
|
||||
return_code = 0
|
||||
output = ""
|
||||
try:
|
||||
output = subprocess.check_output(command)
|
||||
except subprocess.CalledProcessError as e:
|
||||
return_code = e.returncode
|
||||
|
||||
if exit_on_failure:
|
||||
rel_log.error("The command %s failed with return code: %s",
|
||||
(' '.join(command)), return_code)
|
||||
sys.exit(1)
|
||||
return return_code, output
|
||||
|
||||
|
||||
def get_curr_sha(repo_path):
|
||||
"""
|
||||
Gets the latest SHA for the specified repo.
|
||||
|
||||
:param repo_path: Path to a git repository.
|
||||
:return: Last commit SHA.
|
||||
"""
|
||||
|
||||
cmd = ['git', '-C', repo_path, 'log', '--pretty=format:%h', '-n', '1']
|
||||
_, _sha = run_cmd_with_output(cmd, exit_on_failure=True)
|
||||
|
||||
if not _sha:
|
||||
rel_log.error("Could not obtain latest SHA")
|
||||
sys.exit(1)
|
||||
|
||||
rel_log.info("%s SHA = %s", repo_path, _sha)
|
||||
return _sha
|
||||
|
||||
|
||||
def branch_exists(name):
|
||||
"""
|
||||
Check if branch already exists in mbed-os local repository.
|
||||
|
||||
:param name: Branch name.
|
||||
:return: True if branch is already present, False otherwise.
|
||||
"""
|
||||
|
||||
cmd = ['git', 'branch']
|
||||
_, output = run_cmd_with_output(cmd, exit_on_failure=False)
|
||||
|
||||
return name.encode('utf-8') in output
|
||||
|
||||
|
||||
def branch_checkout(name):
|
||||
"""
|
||||
Checkout the required git branch.
|
||||
|
||||
:param name: Branch to checkout.
|
||||
:return: None.
|
||||
"""
|
||||
|
||||
cmd = ['git', 'checkout', name]
|
||||
_, _ = run_cmd_with_output(cmd, exit_on_failure=False)
|
||||
rel_log.info("Checkout to branch %s", name)
|
||||
|
||||
|
||||
def get_last_cherry_pick_sha():
|
||||
"""
|
||||
Finds the SHA of last cherry picked commit.
|
||||
SHA should be added to cherry-pick commits with -x option.
|
||||
|
||||
:return: SHA if found, None otherwise.
|
||||
"""
|
||||
|
||||
get_commit = ['git', 'log', '-n', '1']
|
||||
_, output = run_cmd_with_output(get_commit, exit_on_failure=True)
|
||||
|
||||
shas = re.findall(
|
||||
pattern='^\s*\(cherry picked from commit ([0-9a-fA-F]+)\)$',
|
||||
string=output.decode('utf-8'),
|
||||
flags=re.MULTILINE
|
||||
)
|
||||
|
||||
return shas[-1] if shas else None
|
||||
|
||||
|
||||
def normalize_commit_sha(sha_lst):
|
||||
"""
|
||||
The commit_sha section of the config file can hold commits in 2 ways:
|
||||
* "<SHA>" - E.g. "428acae1b2ac15c3ad523e8d40755a9301220822".
|
||||
* {"sha": "<SHA>", "msg": "<HELP>"} - E.g.
|
||||
{"sha": "d9d622afe0ca8c7ab9d24c17f9fe59b54dcc61c9", "msg": "Fix ..."}.
|
||||
|
||||
:param sha_lst: JSON data from config file.
|
||||
:return: list of commit SHA.
|
||||
"""
|
||||
return [_sha['sha'] if isinstance(_sha, dict) else _sha for _sha in sha_lst]
|
||||
|
||||
|
||||
def get_parser():
|
||||
parser = argparse.ArgumentParser(
|
||||
description=__doc__,
|
||||
formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
|
||||
parser.add_argument('-l', '--log-level',
|
||||
help="Level for providing logging output",
|
||||
choices=['DEBUG', 'INFO', 'ERROR'],
|
||||
default='INFO',
|
||||
action=SetLogLevel)
|
||||
parser.add_argument('-r', '--repo-path',
|
||||
help="Git Repository to be imported",
|
||||
required=True,
|
||||
action=StoreDir)
|
||||
parser.add_argument('-c', '--config-file',
|
||||
help="Configuration file",
|
||||
required=True,
|
||||
type=argparse.FileType('r'))
|
||||
|
||||
return parser
|
||||
|
||||
|
||||
def main():
|
||||
parser = get_parser()
|
||||
args = parser.parse_args()
|
||||
sha = get_curr_sha(args.repo_path).decode('utf-8')
|
||||
repo_dir = os.path.basename(args.repo_path)
|
||||
branch = 'feature_' + repo_dir + '_' + sha
|
||||
commit_msg = "[" + repo_dir + "]" + ": Updated to " + sha
|
||||
|
||||
# Read configuration data
|
||||
json_data = json.load(args.config_file)
|
||||
|
||||
'''
|
||||
Check if branch exists already, in case branch is present
|
||||
we will skip all file transfer and merge operations and will
|
||||
jump to cherry-pick
|
||||
'''
|
||||
if branch_exists(branch):
|
||||
rel_log.info("Branch present = %s", branch)
|
||||
else:
|
||||
data_files = json_data["files"]
|
||||
data_folders = json_data["folders"]
|
||||
import_files(args.repo_path, data_files, data_folders)
|
||||
|
||||
# Create new branch with all changes
|
||||
create_branch = ['git', 'checkout', '-b', branch]
|
||||
run_cmd_with_output(create_branch, exit_on_failure=True)
|
||||
rel_log.info("Branch created: %s", branch)
|
||||
|
||||
add_files = ['git', 'add', '-A']
|
||||
run_cmd_with_output(add_files, exit_on_failure=True)
|
||||
|
||||
commit_branch = ['git', 'commit', '-m', commit_msg]
|
||||
run_cmd_with_output(commit_branch, exit_on_failure=True)
|
||||
rel_log.info('Commit added: "%s"', commit_msg)
|
||||
|
||||
# Checkout the feature branch
|
||||
branch_checkout(branch)
|
||||
commit_sha = normalize_commit_sha(json_data["commit_sha"])
|
||||
last_sha = get_last_cherry_pick_sha()
|
||||
|
||||
# Few commits are already applied, check the next in sequence
|
||||
# and skip to next commit
|
||||
if last_sha:
|
||||
assert last_sha in commit_sha, "%s not found in config file" % last_sha
|
||||
# Calculate the index of the next sha to be applied
|
||||
next_sha_idx = commit_sha.index(last_sha) + 1
|
||||
if next_sha_idx >= len(commit_sha):
|
||||
rel_log.info("No more commits to apply")
|
||||
sys.exit(0)
|
||||
# Skipping applied commits
|
||||
commit_sha = commit_sha[next_sha_idx:]
|
||||
|
||||
# Apply commits specific to mbed-os changes
|
||||
for sha in commit_sha:
|
||||
cherry_pick_sha = ['git', 'cherry-pick', '-x', sha]
|
||||
rel_log.info("Cherry-picking commit = %s", sha)
|
||||
run_cmd_with_output(cherry_pick_sha, exit_on_failure=True)
|
||||
|
||||
rel_log.info("Finished import successfully :)")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
with DirContext(ROOT):
|
||||
main()
|
||||
323
tools/importer/psa_compliance_importer.json
Normal file
323
tools/importer/psa_compliance_importer.json
Normal file
@@ -0,0 +1,323 @@
|
||||
{
|
||||
"files": [{
|
||||
"src_file": "val/nspe/pal_interfaces_ns.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/pal_interfaces_ns.h"
|
||||
},
|
||||
{
|
||||
"src_file": "platform/targets/tgt_dev_apis_mbedos_fvp_mps2_m4/nspe/initial_attestation/pal_attestation_intf.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/pal/pal_attestation_intf.h"
|
||||
},
|
||||
{
|
||||
"src_file": "platform/targets/tgt_dev_apis_mbedos_fvp_mps2_m4/nspe/initial_attestation/pal_attestation_intf.c",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/pal/pal_attestation_intf.c"
|
||||
},
|
||||
{
|
||||
"src_file": "platform/targets/tgt_dev_apis_mbedos_fvp_mps2_m4/nspe/initial_attestation/pal_attestation_eat.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/pal_attestation_eat.h"
|
||||
},
|
||||
{
|
||||
"src_file": "platform/targets/tgt_dev_apis_mbedos_fvp_mps2_m4/nspe/initial_attestation/pal_attestation_eat.c",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/pal_attestation_eat.c"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_attestation.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_attestation.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_attestation.c",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_attestation.c"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_attestation.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_attestation.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/common/val_client_defs.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_client_defs.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_crypto.c",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_crypto.c"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_crypto.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_crypto.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_entry.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_entry.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_interfaces.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_interfaces.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_interfaces.c",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_interfaces.c"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_internal_trusted_storage.c",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_internal_trusted_storage.c"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_internal_trusted_storage.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_internal_trusted_storage.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_protected_storage.c",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_protected_storage.c"
|
||||
},
|
||||
{
|
||||
"src_file": "val/nspe/val_protected_storage.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_protected_storage.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/common/val_target.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val_target.h"
|
||||
},
|
||||
{
|
||||
"src_file": "val/common/val.h",
|
||||
"dest_file": "features/frameworks/TARGET_PSA/val.h"
|
||||
},
|
||||
{
|
||||
"src_file": "docs/psa_attestation_testlist.md",
|
||||
"dest_file": "components/TARGET_PSA/TESTS/compliance_attestation/psa_attestation_testlist.md"
|
||||
},
|
||||
{
|
||||
"src_file": "docs/psa_crypto_testlist.md",
|
||||
"dest_file": "components/TARGET_PSA/TESTS/compliance_crypto/psa_crypto_testlist.md"
|
||||
},
|
||||
{
|
||||
"src_file": "docs/psa_its_testlist.md",
|
||||
"dest_file": "components/TARGET_PSA/TESTS/compliance_its/psa_its_testlist.md"
|
||||
}
|
||||
],
|
||||
"folders": [{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s001/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s001/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s002/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s002/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s003/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s003/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s004/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s004/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s005/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s005/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s006/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s006/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s007/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s007/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s008/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s008/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s009/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s009/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/internal_trusted_storage/test_s010/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_its/test_s010/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/initial_attestation/test_a001/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_attestation/test_a001/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c001/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c001/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c002/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c002/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c003/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c003/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c004/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c004/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c005/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c005/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c006/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c006/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c007/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c007/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c008/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c008/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c009/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c009/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c010/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c010/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c011/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c011/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c012/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c012/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c013/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c013/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c014/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c014/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c015/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c015/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c016/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c016/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c017/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c017/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c018/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c018/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c019/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c019/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c020/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c020/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c021/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c021/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c022/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c022/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c023/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c023/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c024/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c024/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c025/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c025/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c026/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c026/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c027/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c027/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c028/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c028/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c029/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c029/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c030/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c030/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c031/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c031/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c032/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c032/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c033/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c033/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c034/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c034/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c035/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c035/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c036/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c036/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c037/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c037/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c038/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c038/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c039/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c039/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c040/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c040/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c041/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c041/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c042/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c042/"
|
||||
},
|
||||
{
|
||||
"src_folder": "dev_apis/crypto/test_c043/",
|
||||
"dest_folder": "components/TARGET_PSA/TESTS/compliance_crypto/test_c043/"
|
||||
}
|
||||
],
|
||||
"commit_sha": [
|
||||
"67ada4404f0aec2a398bebdb8973b901e07e5003",
|
||||
"22e429bdd4cf0d1a40e416a206420d5938a226e1",
|
||||
"eae1252c29d15207d6d3b89bcab8c644c652e6f8",
|
||||
"1650a923eb6f79051544b2c57fb72140eaae4f65",
|
||||
"2982907e37b695d9dee9db7026a3ae0ecbd04451",
|
||||
"16a59cb9926bc96792cc9d1b7a996689f7bf1b86",
|
||||
"c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b",
|
||||
"053e07b6dc7a2db6c4225e082e3ddb118aade882"
|
||||
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user