diff --git a/.gitignore b/.gitignore index 1318247143e794f95c0503b3e464ee7d36bd0276..8492c1c736b08d1327b92a98b4f6a80cf93f3b8a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,5 @@ project __pycache__ oebuild.egg-info .vscode -build +./build dist \ No newline at end of file diff --git a/src/oebuild/docker_proxy.py b/src/oebuild/docker_proxy.py index 458c93561447afd500d594f71f1fdf77db394b47..ddd7f1e5867170a4fa11e3320a9972b5f93a4df4 100644 --- a/src/oebuild/docker_proxy.py +++ b/src/oebuild/docker_proxy.py @@ -201,7 +201,7 @@ class DockerProxy: stderr=True, stdout=True, stream=True if "stream" not in params else params['stream'], - demux=False if "demux" not in params else params['dumex'] + demux=False if "demux" not in params else params['demux'] ) return res diff --git a/src/oebuild/parse_compile.py b/src/oebuild/parse_compile.py index d4ef81ef256457d05cd029bf0acfa3e1f96fab2a..ede03d23bd60c85869ff03b1bb7d76c7977f7cbf 100644 --- a/src/oebuild/parse_compile.py +++ b/src/oebuild/parse_compile.py @@ -26,7 +26,7 @@ from oebuild.m_log import logger @dataclass class DockerParam: ''' - xxxxxxxxx + DockerParam defines the various parameters required for container startup ''' # point out the docker image image: str @@ -39,9 +39,9 @@ class DockerParam: @dataclass -class Compile(PlatformTemplate): +class BuildParam: ''' - Compile is the parsed object of compile.yaml and is used to manipulate the build file + Carries the compilation-related parameters. ''' toolchain_dir: Optional[str] @@ -49,8 +49,6 @@ class Compile(PlatformTemplate): not_use_repos: bool - build_in: str - sstate_cache: Optional[str] sstate_dir: Optional[str] @@ -59,6 +57,14 @@ class Compile(PlatformTemplate): docker_image: Optional[str] + +@dataclass +class Compile(PlatformTemplate, BuildParam): + ''' + Compile is the parsed object of compile.yaml and is used to manipulate the build file + ''' + build_in: str + docker_param: Optional[DockerParam]