From 18d7960acfa7eca159c9ff6ce871fdc53c0d0646 Mon Sep 17 00:00:00 2001 From: Caohongtao Date: Tue, 2 Apr 2024 09:00:04 +0000 Subject: [PATCH] update src/oebuild/app/plugins/generate/generate.py. Signed-off-by: Caohongtao --- src/oebuild/app/plugins/generate/generate.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/oebuild/app/plugins/generate/generate.py b/src/oebuild/app/plugins/generate/generate.py index 53d53af..57d594a 100644 --- a/src/oebuild/app/plugins/generate/generate.py +++ b/src/oebuild/app/plugins/generate/generate.py @@ -217,7 +217,7 @@ class Generate(OebuildCommand): if not os.path.exists(config_path): sys.exit(0) generate_command = self.generate_command(config_path) - subprocess.check_output(f'rm {config_path}', shell=True) + subprocess.check_output(f'rm -rf {config_path}', shell=True) args = args.parse_args(generate_command) else: args = args.parse_args(unknown) @@ -306,14 +306,15 @@ class Generate(OebuildCommand): print( f"{key}, {oebuild_config.docker.repo_url}:{value}") k = input("please entry number:") - if k == "q": + if k == "q" or k=="Q": sys.exit(0) try: index = int(k) docker_tag = image_list[index] break except IndexError: - print("please entry true number") + print("please entry true number!") + continue docker_tag = docker_tag.strip() docker_tag = docker_tag.strip('\n') docker_image = f"{oebuild_config.docker.repo_url}:{docker_tag}" @@ -408,7 +409,7 @@ wrong platform, please run `oebuild generate -l` to view support feature""") # detects if a build directory already exists if os.path.exists(build_dir): - logger.warning("the build directory %s already exists", build_dir) + logger.warning("The build directory %s already exists", build_dir) while True: in_res = input(""" do you want to overwrite it? the overwrite action will replace the compile.yaml @@ -438,7 +439,7 @@ wrong platform, please run `oebuild generate -l` to view support feature""") yocto_dir = self.configure.source_yocto_dir() yocto_oebuild_dir = os.path.join(yocto_dir, ".oebuild") list_platform = os.listdir(os.path.join(yocto_oebuild_dir, 'platform')) - print("the platform list is:") + print("the platform list is:", list_platform) table = PrettyTable(['platform name']) table.align = "l" for platform in list_platform: @@ -452,7 +453,7 @@ wrong platform, please run `oebuild generate -l` to view support feature""") yocto_dir = self.configure.source_yocto_dir() yocto_oebuild_dir = os.path.join(yocto_dir, ".oebuild") list_feature = os.listdir(os.path.join(yocto_oebuild_dir, 'features')) - print("the feature list is:") + print("the feature list is:",list_feature) table = PrettyTable(['feature name', 'support arch']) table.align = "l" for feature in list_feature: @@ -527,7 +528,7 @@ wrong platform, please run `oebuild generate -l` to view support feature""") if os.path.exists(platform_path): platform_list = os.listdir(platform_path) else: - logger.error('platform dir is not exists') + logger.error('Platform dir is not exists') sys.exit(-1) platform_start = textwrap.dedent(""" comment " THIS IS CHOOSE PLATFORM " @@ -643,8 +644,7 @@ wrong platform, please run `oebuild generate -l` to view support feature""") '').split('--') generate_command += build_command - platform = platform_search.group( - ) if platform_search else 'qemu-aarch64' + platform = platform_search.group() if platform_search else 'qemu-aarch64' generate_command += ['-p', platform.lower()] for feature in feature_list: @@ -691,6 +691,7 @@ wrong platform, please run `oebuild generate -l` to view support feature""") os.chdir(build_dir) subprocess.run('oebuild bitbake buildtools-extended-tarball', shell=True, check=False) + def tool_chain(self, toolchain_name_list): """ -- Gitee