[PATCH 1/2] Update source plugins to run with pyro

[Andreas J. Reichel]

From: Andreas Reichel <andreas.r...@siemens.com>

Update wic source plugins to run with pyro's
wic version.

Signed-off-by: Andreas Reichel <andreas.r...@siemens.com>
---
scripts/lib/wic/plugins/source/efibootguard-boot.py | 4 ++--
scripts/lib/wic/plugins/source/efibootguard-efi.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py
index bad7c27..1a2640b 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
@@ -32,8 +32,8 @@ import logging

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
+from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
+ BOOTDD_EXTRA_SPACE

msger = logging.getLogger('wic')

diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py
index 8a33412..7c6a544 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
@@ -33,8 +33,8 @@ import logging

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
+from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
+ BOOTDD_EXTRA_SPACE

msger = logging.getLogger('wic')

--
2.16.0

[Andreas J. Reichel]

From: Andreas Reichel <andreas.r...@siemens.com>

This small patch series enables Poky Pyro support by backporting
the last patch series.

Note: This patch series is based upon the series for Poky Rocko support.
It should go into a branch named Pyro.

Andreas Reichel (2):
Update source plugins to run with pyro
Adapt README.md for pyro branch

README.md | 6 +++---

scripts/lib/wic/plugins/source/efibootguard-boot.py | 4 ++--
scripts/lib/wic/plugins/source/efibootguard-efi.py | 4 ++--

3 files changed, 7 insertions(+), 7 deletions(-)

--
2.16.0

[Andreas J. Reichel]

From: Andreas Reichel <andreas.r...@siemens.com>

Document used commit SHAs for testing the layer with Poky Pyro.

Signed-off-by: Andreas Reichel <andreas.r...@siemens.com>
---

README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 639bd78..1e7611b 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,13 @@ Archive:

Tested with:

-poky (rocko): 16e22f3e37788afb83044f5089d24187d70094bd
+poky (pyro): 5e552100b0a093976b633c57dd36259710d55873
https://git.yoctoproject.org/git/poky

-meta-intel: aa246ba9855d35d454ddcf041578310cbaa90250
+meta-intel: 4cd63f57820ce0e4ebd598251d3a13b5a4b9b791
https://git.yoctoproject.org/git/meta-intel

-meta-openembedded: 29a4983d5a4462d8e7b9abcd55bfb3013f578fdd
+meta-openembedded: dfbdd28d206a74bf264c2f7ee0f7b3e5af587796
http://git.openembedded.org/meta-openembedded

## project integration ##
--
2.16.0