From a45e75775d87a33d91c519a841c0adbfaf71d1df Mon Sep 17 00:00:00 2001 From: panwentao Date: Tue, 27 Feb 2024 15:47:11 +0800 Subject: [PATCH 1/2] generate: Set the default value of directory in generate to None * Set the default value of directory in generate to None Signed-off-by: panwentao --- src/oebuild/app/plugins/generate/generate.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/oebuild/app/plugins/generate/generate.py b/src/oebuild/app/plugins/generate/generate.py index a9e934e..4e13ed7 100644 --- a/src/oebuild/app/plugins/generate/generate.py +++ b/src/oebuild/app/plugins/generate/generate.py @@ -151,6 +151,7 @@ class Generate(OebuildCommand): return parser + # pylint:disable=[R0914,R0911,R0912,R0915] def do_run(self, args: argparse.Namespace, unknown=None): # perpare parse help command if self.pre_parse_help(args, unknown): @@ -550,7 +551,7 @@ def basic_config(): is_disable_fetch_help = ("(this param is set openeuler_fetch in local.conf, " "the default value is enable, if set -df, the OPENEULER_FETCH" "will set to 'disable')") - basic_str = textwrap.dedent(""" + basic_str = textwrap.dedent(f""" comment " THIS IS BASIC CONFIG " config BASIC-SSTATE_CACHE--S string "sstate_cache (this param is for SSTATE_MIRRORS)" @@ -563,7 +564,7 @@ def basic_config(): default "None" config BASIC-DIRECTORY--D string "directory (this param is build directory, the default is same to platform)" - default "qemu-aarch64" + default "None" config BASIC-TOOLCHAIN_DIR--T string "toolchain_dir {toolchain_help}" default "None" @@ -588,7 +589,5 @@ def basic_config(): config BUILD-B_IN--HOST bool "build_in_host" endchoice - """.format(toolchain_help=toolchain_help, - nativesdk_help=nativesdk_help, - is_disable_fetch_help=is_disable_fetch_help)) + """) return basic_str -- Gitee From 9e6ce47fc54c1b0c1d1a65486f4ca9fb59c15365 Mon Sep 17 00:00:00 2001 From: panwentao Date: Tue, 19 Mar 2024 17:52:31 +0800 Subject: [PATCH 2/2] local_conf: Modify splicing path * Modify splicing path Signed-off-by: panwentao --- src/oebuild/local_conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/oebuild/local_conf.py b/src/oebuild/local_conf.py index 9e75ec2..6b79d36 100644 --- a/src/oebuild/local_conf.py +++ b/src/oebuild/local_conf.py @@ -57,8 +57,8 @@ def get_nativesdk_sysroot(nativesdk_dir=oebuild_const.NATIVESDK_DIR): if ret is not None: abs_path = os.path.join(sysroot_dir, item) if os.path.isdir(abs_path): - return os.path.join("sysroot", item) - logger.error("can not find any sysroot directory") + return os.path.join("sysroots", item) + logger.error("can not find any sysroots directory") sys.exit(1) -- Gitee