AUH's testimage logic is still checking for BB_ENV_EXTRAWHITE instead of BB_ENV_PASSTHROUGH_ADDITIONS, and INHERIT += "testimage" instead of IMAGE_CLASSES += "testimage". Update it so that checks for the correct variable names.
Signed-off-by: Trevor Gamblin <[email protected]> --- modules/testimage.py | 2 +- upgrade-helper.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/testimage.py b/modules/testimage.py index 0fc1adb..fb2e467 100644 --- a/modules/testimage.py +++ b/modules/testimage.py @@ -53,7 +53,7 @@ class TestImage(): self.logdir = os.path.join(uh_work_dir, "testimage-logs") os.mkdir(self.logdir) - os.environ['BB_ENV_EXTRAWHITE'] = os.environ['BB_ENV_EXTRAWHITE'] + \ + os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'] = os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'] + \ " CORE_IMAGE_EXTRA_INSTALL TEST_LOG_DIR TESTIMAGE_UPDATE_VARS" def _get_pkgs_to_install(self, pkgs): diff --git a/upgrade-helper.py b/upgrade-helper.py index 869dc3f..e307d60 100755 --- a/upgrade-helper.py +++ b/upgrade-helper.py @@ -262,7 +262,7 @@ class Updater(object): enabled = False if settings.get("testimage", "no") == "yes": - if 'testimage' in self.base_env['INHERIT']: + if 'testimage' in self.base_env['IMAGE_CLASSES']: if not "ptest" in self.base_env["DISTRO_FEATURES"]: E(" testimage requires ptest in DISTRO_FEATURES please add to"\ " conf/local.conf.") @@ -271,8 +271,8 @@ class Updater(object): enabled = True else: E(" testimage was enabled in upgrade-helper.conf"\ - " but isn't INHERIT in conf/local.conf, if you want"\ - " to enable please set.") + " but isn't added to IMAGE_CLASSES in conf/local.conf, \ + if you want to enable please set.") exit(1) return enabled -- 2.45.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#63208): https://lists.yoctoproject.org/g/yocto/message/63208 Mute This Topic: https://lists.yoctoproject.org/mt/106334464/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
