瀏覽代碼

oe-pkgdata-util: Check if environment script is initialized

Tinfoil doesn't behave well if environment is not initialized, this check ensures a proper error log if environment is not initialized.

[YOCTO #12096]

(From OE-Core rev: dfa4b0e6cabb870a33627ff5a0b5f413f6edb1e2)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Dorinda 4 年之前
父節點
當前提交
df4d2a6a8c
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      scripts/oe-pkgdata-util

+ 3 - 0
scripts/oe-pkgdata-util

@@ -598,6 +598,9 @@ def main():
             logger.error("Unable to find bitbake by searching parent directory of this script or PATH")
             logger.error("Unable to find bitbake by searching parent directory of this script or PATH")
             sys.exit(1)
             sys.exit(1)
         logger.debug('Found bitbake path: %s' % bitbakepath)
         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()
         tinfoil = tinfoil_init()
         try:
         try:
             args.pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR')
             args.pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR')