[PATCH] esdk: locked sig mismatch warnings when build from esdk env

From: Mani Selvaraj <redacted>

A repo with multiple layers are placed under /layers/ and a repo
with single layer is placed under /layers/openembedded-core in esdk.
This tiggered locked sig mismatch warnings when building image from
esdk environment.
-----
TOPDIR=/Code/build
corebase=/Code/openembedded-core
-----
/Code/meta-java
/Code/meta-gplv2
/Code/meta-openembedded/meta-webserver
/Code/meta-openembedded/meta-oe
/Code/openembedded-core/meta
Are moved to
/sdk_org/layers/openembedded-core/meta-gplv2
/sdk_org/layers/openembedded-core/meta-java
/sdk_org/layers/meta-openembedded/meta-webserver
/sdk_org/layers/meta-openembedded/meta-oe
/sdk_org/layers/openembedded-core/meta

here fix it to move all layers under /layers dir.

to check this fix build image from esdk environment and
check for sig mismatch warnings.

Signed-off-by: Mani Selvaraj <redacted>
Signed-off-by: Khem Raj <redacted>
---
 meta/lib/oe/copy_buildsystem.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index d97bf9d1b9..4998afa60f 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py

@@ -102,8 +102,6 @@ class BuildSystem(object):
                 layerdestpath += '/' + os.path.basename(corebase)
             else:
                 layer_relative = os.path.relpath(layer, corebase)
-                if os.path.dirname(layer_relative) == corebase_relative:
-                    layer_relative = os.path.dirname(corebase_relative) + '/' + layernewname
                 layer_relative = os.path.basename(corebase) + '/' + layer_relative
                 if os.path.dirname(layer_relative) != layernewname:
                     layerdestpath += '/' + os.path.dirname(layer_relative)

-- 
2.32.0

ping

On Thu, Jun 24, 2021 at 9:54 AM Khem Raj [off-list ref] wrote:

ping^2, this helps with installing ESDK which has components using
multiple git repos in SRC_URI
if there is any issue with this patch, please reply here.

On Wed, Jul 7, 2021 at 10:16 AM Khem Raj [off-list ref] wrote:

ping

On Thu, Jun 24, 2021 at 9:54 AM Khem Raj [off-list ref] wrote:

quoted

From: Mani Selvaraj <redacted>

A repo with multiple layers are placed under /layers/ and a repo
with single layer is placed under /layers/openembedded-core in esdk.
This tiggered locked sig mismatch warnings when building image from
esdk environment.
-----
TOPDIR=/Code/build
corebase=/Code/openembedded-core
-----
/Code/meta-java
/Code/meta-gplv2
/Code/meta-openembedded/meta-webserver
/Code/meta-openembedded/meta-oe
/Code/openembedded-core/meta
Are moved to
/sdk_org/layers/openembedded-core/meta-gplv2
/sdk_org/layers/openembedded-core/meta-java
/sdk_org/layers/meta-openembedded/meta-webserver
/sdk_org/layers/meta-openembedded/meta-oe
/sdk_org/layers/openembedded-core/meta

here fix it to move all layers under /layers dir.

to check this fix build image from esdk environment and
check for sig mismatch warnings.

Signed-off-by: Mani Selvaraj <redacted>
Signed-off-by: Khem Raj <redacted>
---
 meta/lib/oe/copy_buildsystem.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index d97bf9d1b9..4998afa60f 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py

@@ -102,8 +102,6 @@ class BuildSystem(object):
                 layerdestpath += '/' + os.path.basename(corebase)
             else:
                 layer_relative = os.path.relpath(layer, corebase)
-                if os.path.dirname(layer_relative) == corebase_relative:
-                    layer_relative = os.path.dirname(corebase_relative) + '/' + layernewname
                 layer_relative = os.path.basename(corebase) + '/' + layer_relative
                 if os.path.dirname(layer_relative) != layernewname:
                     layerdestpath += '/' + os.path.dirname(layer_relative)
--

2.32.0

On Thu, 2021-07-22 at 12:36 -0700, Khem Raj wrote:

ping^2, this helps with installing ESDK which has components using
multiple git repos in SRC_URI
if there is any issue with this patch, please reply here.

I think it may break when you add repos like meta-selftest which exist 
alongside meta in OE-Core. I haven't had time to prove/disprove that
thought though...

Cheers,

Richard

On Thu, Jul 22, 2021 at 1:12 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

On Thu, 2021-07-22 at 12:36 -0700, Khem Raj wrote:

quoted

ping^2, this helps with installing ESDK which has components using
multiple git repos in SRC_URI
if there is any issue with this patch, please reply here.

I think it may break when you add repos like meta-selftest which exist
alongside meta in OE-Core. I haven't had time to prove/disprove that
thought though...

Ok so how can we validate that I can help test that out

Cheers,

Richard