From: Dmitri Toubelis <[email protected]> This reverts commit 3d12a2598456723e6a77241d1464ec19faf1b3d9.
Signed-off-by: Dmitri Toubelis <[email protected]> --- scripts/lib/wic/plugins/source/efibootguard-boot.py | 13 +++++++------ scripts/lib/wic/plugins/source/efibootguard-efi.py | 12 ++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py index bad7c27..e9e0868 100644 --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py @@ -28,14 +28,12 @@ import os import shutil -import logging +from wic import msger from wic.pluginbase import SourcePlugin -from wic.engine import get_custom_config -from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ - BOOTDD_EXTRA_SPACE - -msger = logging.getLogger('wic') +from wic.utils.misc import get_custom_config +from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ + BOOTDD_EXTRA_SPACE class EfibootguardBootPlugin(SourcePlugin): """ @@ -88,6 +86,9 @@ class EfibootguardBootPlugin(SourcePlugin): msger.error("HDDDIR not set, exiting\n") os.exit(1) + # just so the result notes display it + creator.set_bootimg_dir(bootimg_dir) + staging_kernel_dir = kernel_dir hdddir = "%s/hdd/%s.%s" % (cr_workdir, part.label, part.lineno) diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py index 8a33412..0ba6b8c 100644 --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py @@ -29,14 +29,12 @@ import os import os.path import shutil -import logging +from wic import msger from wic.pluginbase import SourcePlugin -from wic.engine import get_custom_config -from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ - BOOTDD_EXTRA_SPACE - -msger = logging.getLogger('wic') +from wic.utils.misc import get_custom_config +from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ + BOOTDD_EXTRA_SPACE class EfibootguardEFIPlugin(SourcePlugin): """ @@ -59,6 +57,8 @@ class EfibootguardEFIPlugin(SourcePlugin): bootimg_dir = get_bitbake_var("HDDDIR") if not bootimg_dir: msger.error("HDDDIR not set, exiting\n") + # just so the result notes display it + creator.set_bootimg_dir(bootimg_dir) staging_kernel_dir = kernel_dir -- 1.9.1 -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/efibootguard-dev/1517432107-25786-1-git-send-email-dmitri%40toubelis.org. For more options, visit https://groups.google.com/d/optout.
