diff --git a/src/oebuild/local_conf.py b/src/oebuild/local_conf.py index 83828b9a31bf8929c8298e9340989de1ba55d4fb..ca72555a07bf27df9fef4cffb5b3e4a1bf982659 100644 --- a/src/oebuild/local_conf.py +++ b/src/oebuild/local_conf.py @@ -168,7 +168,10 @@ class LocalConf: content = self.match_lib_param(content=content) - content = self.replace_param(parse_compile=parse_compile, content=content) + user_content_flag = "#===========the content is user added==================" + if user_content_flag not in content and parse_compile.local_conf != "": + content += f"\n{user_content_flag}\n" + content += parse_compile.local_conf if content is None: return diff --git a/src/oebuild/parse_template.py b/src/oebuild/parse_template.py index 4a5464f32083eefe49edb339f375c85aaaacb7d4..921f984ef1174cf1e52d1b20b2b13eb0b1c246de 100644 --- a/src/oebuild/parse_template.py +++ b/src/oebuild/parse_template.py @@ -137,8 +137,8 @@ class ParseTemplate: machine=data['machine'], toolchain_type=data['toolchain_type'], repos=repo_dict, - local_conf=local_conf, - layers=layers) + local_conf=None if local_conf is None else LiteralScalarString(local_conf), + layers=None if layers is None else layers) return if self.platform_template is None: @@ -156,8 +156,8 @@ class ParseTemplate: feature_name=LiteralScalarString(os.path.splitext(config_name)[0]), repos=repo_dict, support=support_arch, - local_conf=LiteralScalarString(local_conf), - layers=layers + local_conf=None if local_conf is None else LiteralScalarString(local_conf), + layers=None if layers is None else layers )) except Exception as e_p: @@ -255,6 +255,7 @@ class ParseTemplate: compile_conf['repos'] = repos compile_conf['local_conf'] = local_conf compile_conf['layers'] = layers + return compile_conf @staticmethod diff --git a/src/oebuild/version.py b/src/oebuild/version.py index 81392fe79a5ff3f7577769a60f20dc25d29af4e7..05f2c9a10b5eeb322c16d62d0a7fc7dc0d17cbd4 100644 --- a/src/oebuild/version.py +++ b/src/oebuild/version.py @@ -10,4 +10,4 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. ''' -__version__ = '0.0.18' +__version__ = '0.0.21'