[meta-efibootguard][PATCH] Revert "Update source plugins to work with newer wic"

[dmi...@toubelis.org]

From: Dmitri Toubelis <dmitri....@litmusautomation.com>

This reverts commit 3d12a2598456723e6a77241d1464ec19faf1b3d9.

Signed-off-by: Dmitri Toubelis <dmitri....@litmusautomation.com>
---
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

[Jan Kiszka]

On 2018-01-31 21:55, dmi...@toubelis.org wrote:
> From: Dmitri Toubelis <dmitri....@litmusautomation.com>
>
> This reverts commit 3d12a2598456723e6a77241d1464ec19faf1b3d9.
>

Thanks, but instead of explicitly reverting, I would simply fork off
morty from 1331dd74a9fa. Will send a trivial README patch soon as well.
Should give you the same results. If you like to share your morty test
base in form of hashes for the README, that would be welcome.

Jan

--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

[dmitri....@litmusautomation.com]

I believe there were some valuable commits after that. That I why I oly reverted the one that is relevant.

[Jan Kiszka]

On 2018-02-01 14:26, dmitri....@litmusautomation.com wrote:
> I believe there were some valuable commits after that. That I why I oly
> reverted the one that is relevant.

There are only two commits after my current morty branching point
(1331dd7):

0d8218a (origin/rocko, origin/next, origin/master, rocko, next, master) Adapt README.md for rocko branch
3d12a25 Update source plugins to work with newer wic
1331dd7 When creating a dir, wait till finished

Jan

>
> On Thursday, February 1, 2018 at 1:57:07 AM UTC-5, Jan Kiszka wrote:
>

> On 2018-01-31 21:55, dmi...@toubelis.org <javascript:> wrote:
> > From: Dmitri Toubelis <dmitri....@litmusautomation.com <javascript:>>

> >
> > This reverts commit 3d12a2598456723e6a77241d1464ec19faf1b3d9.
> >
>
> Thanks, but instead of explicitly reverting, I would simply fork off
> morty from 1331dd74a9fa. Will send a trivial README patch soon as well.
> Should give you the same results. If you like to share your morty test
> base in form of hashes for the README, that would be welcome.
>
> Jan
>
> --
> Siemens AG, Corporate Technology, CT RDA IOT SES-DE
> Corporate Competence Center Embedded Linux
>

> --
> 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 efibootguard-d...@googlegroups.com
> <mailto:efibootguard-d...@googlegroups.com>.
> To post to this group, send email to efibootg...@googlegroups.com
> <mailto:efibootg...@googlegroups.com>.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/efibootguard-dev/912bf504-f597-41c3-bd9f-154e5aaadd11%40googlegroups.com
> <https://groups.google.com/d/msgid/efibootguard-dev/912bf504-f597-41c3-bd9f-154e5aaadd11%40googlegroups.com?utm_medium=email&utm_source=footer>.
> For more options, visit https://groups.google.com/d/optout.