diff options
| author | Chris Johns <chrisj@rtems.org> | 2022-09-27 07:55:48 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2022-09-27 07:55:48 +1000 |
| commit | dba86d9a16b2f02f79b450862d7e81d2830dffc5 (patch) | |
| tree | 41bbd2f81cdae230c01e8a261cdd0afd8249acd5 | |
| parent | 5bd628d18c1a7fb8a5956acacb0c7cccc64bc163 (diff) | |
waf: Fix packaging configure logic
| -rw-r--r-- | pkg/__init__.py | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkg/__init__.py b/pkg/__init__.py index 0b53f6d..07c7620 100644 --- a/pkg/__init__.py +++ b/pkg/__init__.py @@ -48,11 +48,6 @@ def init(ctx): def options(opt): if packager is not None: - opt.add_option('--package', - action='store_true', - default=False, - dest='package', - help='Package build if supported and set up') pkg.configs.options(opt) packager.options(opt) @@ -62,16 +57,11 @@ def configure(conf): conf.env.PACKAGER = False if packager is not None: packager.configure(conf) - package_build = 'no' - if conf.options.package: - if not conf.env.PACKAGER: - conf.fatal( - 'Platform packager not supported or installed,' + \ - ' please fix to package build' - ) - package_build = 'yes' - conf.env.PACKAGE = True - conf.msg('Package build', package_build) + if conf.env.PACKAGER: + p = 'yes' + else: + p = 'no' + conf.msg('Packaging', p) def build(bld, build, bset, dry_run): |