openubmc-bingo 0.6.43__py3-none-any.whl → 0.6.45__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.43'
+__version__ = '0.6.45'

bmcgo/component/template_v2/conanbase.py.mako

@@ -368,8 +368,8 @@ class ConanBase(ConanFile):
             asan_flags = "-fsanitize=address -fsanitize-recover=address,all -fno-omit-frame-pointer -fno-stack-protector -O0"
             tc.extra_cflags.append(asan_flags)
             tc.extra_cxxflags.append(asan_flags)
-            tc.extra_sharedlinkflag.append("LDFLAGS", "-fsanitize=address")
-            tc.extra_exelinkflag.append("LDFLAGS", "-fsanitize=address")
+            tc.extra_sharedlinkflags.append("-fsanitize=address")
+            tc.extra_exelinkflags.append("-fsanitize=address")
 
         # GCOV 标志设置
         if self.options.get_safe("gcov", False):

bmcgo/utils/config.py

@@ -811,19 +811,17 @@ class Config:
         if os.path.isdir(self.temp_platform_build_dir):
             shutil.rmtree(self.temp_platform_build_dir)
         os.makedirs(os.path.join(self.code_path, "temp"), exist_ok=True)
-        mainfest_buildtools_file = os.path.realpath(os.path.join(
-            self.code_path, self.get_manufacture_config("base/dependency_buildtools")
-        ))
-        temp_buildtools_file = os.path.realpath(os.path.join(
-            self.temp_platform_build_dir, self.get_manufacture_config("base/dependency_buildtools")
-        ))
         tools.run_command(f"cp -rf {package_conan_dir} {self.temp_platform_build_dir}")
-        if self.manifest_sdk_flag:
-            if os.path.isfile(mainfest_buildtools_file):
-                tools.run_command(f"cp {mainfest_buildtools_file} {os.path.dirname(temp_buildtools_file)}")
+        # 检查产品是否申明dependency_buildtools配置项，如果存在则需要复制到platform临时目录
+        build_tools = self.get_manufacture_config("base/dependency_buildtools")
+        if build_tools:
+            manifest_buildtools_file = os.path.realpath(os.path.join(self.code_path, build_tools))
+            temp_buildtools_file = os.path.realpath(os.path.join(self.temp_platform_build_dir, build_tools))
+            if os.path.isfile(manifest_buildtools_file):
+                tools.run_command(f"cp {manifest_buildtools_file} {os.path.dirname(temp_buildtools_file)}")
             else:
-                raise errors.BmcGoException("manifest.yaml中未配置base/dependency_buildtools，" +
-                "或在manifest代码仓下无法找到所配置的文件")
+                raise errors.BmcGoException("manifest.yaml中配置的 base/dependency_buildtools文件 " +
+                                            f"'{manifest_buildtools_file}'不存在")
         self.copy_rtos_sdk(package_conan_dir)
         platform_manifest_path = os.path.join(
             self.temp_platform_build_dir, "manifest.yml"

{openubmc_bingo-0.6.43.dist-info → openubmc_bingo-0.6.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.43
+Version: 0.6.45
 Summary: Tools provided by openubmc
 Home-page: https://openubmc.cn
 Classifier: Programming Language :: Python :: 3

{openubmc_bingo-0.6.43.dist-info → openubmc_bingo-0.6.45.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=BJa5lG5w1ONn8K63XashMcH9wCq2YZOssQ7u8IX48_A,562
+bmcgo/__init__.py,sha256=mZO7QbjOEmOIGY9TDOMXwyrSCjIs_sv1oyRnSmUe8Gs,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -190,7 +190,7 @@ bmcgo/component/coverage/c_incremental_cov_report.template,sha256=FPhK1DZtmWsjDx
 bmcgo/component/coverage/incremental_cov.py,sha256=Uf-UdY4CW9rpP4sbURkCXBWyYMXWaG3R1Pyo3cDNvcQ,16859
 bmcgo/component/template/conanbase.py.mako,sha256=dNvbToMSYI7jod7maCpR0PBizvVoQHvXxglmN9LNflg,10984
 bmcgo/component/template/conanfile.deploy.py.mako,sha256=zpxluBjUFmJHfFrnBknxZ3cv3cxcqzJuGh2eN0uMXZA,889
-bmcgo/component/template_v2/conanbase.py.mako,sha256=FA_oKwp3fVC2MsZLiTZWHVeLpLEGkoRYmqhWWZ7EQM4,15768
+bmcgo/component/template_v2/conanbase.py.mako,sha256=H0yO-uijpENtujj_1u037U2mZyy_ykdkV9hkj3mFuV4,15748
 bmcgo/component/template_v2/conanfile.deploy.py.mako,sha256=Xbd-PlfVHOWeRFLfvzINeykiZzzSHsgO_yUUvYrKqTw,512
 bmcgo/functional/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/functional/analysis.py,sha256=pXakxSojBH-dULngbmgMHR3bq9tphOaAN4euGKgEYoc,4016
@@ -245,7 +245,7 @@ bmcgo/utils/build_conans.py,sha256=3afY0XOwFtfcKud2yp6nODIuPoMKjjsoAl5AV8GbJ6w,8
 bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPPt9bPMY,7967
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
 bmcgo/utils/component_version_check.py,sha256=nKfav7EnJ_JWfCvH_SiyhhIapGXUzhFs1QvLb58MPBs,6266
-bmcgo/utils/config.py,sha256=RMrZV39x6q445LdCDnCM1CIoslrIy9FGN4Kp6uV3VRM,50915
+bmcgo/utils/config.py,sha256=QFhPR_ndHLrEcdhFP4X8zRNChEl8cIw4rC2W1wQqaec,50989
 bmcgo/utils/fetch_component_code.py,sha256=WtPJ5h1nM87X6RicrAhMOJzOzh9A0jD3CbjPc4A-REo,11280
 bmcgo/utils/install_manager.py,sha256=XMZUuIHm7_DWRdLV4dAevsyamQ6rt8lb_7OqGWzNBC8,4927
 bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c,7524
@@ -264,8 +264,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=APR3GM-3Q11LFfe8vh7t3LztDn4LLEpNHRUNjkaVekA,143
 bmcgo/utils/installations/installers/apt_installer.py,sha256=nPaCb4cobSi9InN_aHsEPtQ0k4FgsCUWE5_VgBPvcRE,3769
 bmcgo/utils/installations/installers/pip_installer.py,sha256=dDdios1EQ7fzt90r02pZeoM3jCmjslLzkSvzd2hgRVM,3241
-openubmc_bingo-0.6.43.dist-info/METADATA,sha256=i8-bjBQtmM-9IHzXefAEDynKZYHKk4Cog334a6pvmkE,1010
-openubmc_bingo-0.6.43.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.43.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.43.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.43.dist-info/RECORD,,
+openubmc_bingo-0.6.45.dist-info/METADATA,sha256=_QIlG518-b-B2F7q04ZxXvfCltkLp_fw5j-7H5kwGvk,1010
+openubmc_bingo-0.6.45.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.45.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.45.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.45.dist-info/RECORD,,