]> code.ossystems Code Review - openembedded-core.git/commitdiff
oe-pkgdata-util: Check if environment script is initialized
authorDorinda <dorindabassey@gmail.com>
Mon, 1 Feb 2021 14:46:38 +0000 (09:46 -0500)
committerSteve Sakoman <steve@sakoman.com>
Thu, 11 Feb 2021 14:27:21 +0000 (04:27 -1000)
Tinfoil doesn't behave well if environment is not initialized, this check ensures a proper error log if environment is not initialized.

[YOCTO #12096]

Signed-off-by: Dorinda Bassey <dorindabassey@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e88073e16f1b4cfd0f97c81a988640a84adad674)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
scripts/oe-pkgdata-util

index 93220e36178e27f70c6b4b4938faa113977aff13..75dd23efa32aa544a66c23ac6ef0dc6333c7c28e 100755 (executable)
@@ -598,6 +598,9 @@ def main():
             logger.error("Unable to find bitbake by searching parent directory of this script or PATH")
             sys.exit(1)
         logger.debug('Found bitbake path: %s' % bitbakepath)
+        if not os.environ.get('BUILDDIR', ''):
+            logger.error("This script can only be run after initialising the build environment (e.g. by using oe-init-build-env)")
+            sys.exit(1)
         tinfoil = tinfoil_init()
         try:
             args.pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR')