Skip to contentSkip to conversation

esdk: locked sig mismatch warnings when build from esdk env

PATCH In review Khem Raj 2 participants 5 messages Jun 24, 2021 – Jul 23, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 esdk: locked sig mismatch warnings when build from esdk env

From: Mani Selvaraj <[email protected]>

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.

---
 meta/lib/oe/copy_buildsystem.py | 2 --
 1 file changed, 2 deletions(-)
meta/lib/oe/copy_buildsystem.py +0 -2
index d97bf9d1b9..4998afa60f 100644
@@ -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)
Signature · 1 line
2.32.0
author
#1 lore raw

ping

Quoted 50 lines · Khem Raj

From: Mani Selvaraj <[email protected]>

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.

---
 meta/lib/oe/copy_buildsystem.py | 2 --
 1 file changed, 2 deletions(-)
meta/lib/oe/copy_buildsystem.py +0 -3
index d97bf9d1b9..4998afa60f 100644
@@ -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

author
#2 lore raw

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.

Quoted 54 lines · Khem Raj

ping

Quoted 50 lines · Khem Raj

From: Mani Selvaraj <[email protected]>

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.

---
 meta/lib/oe/copy_buildsystem.py | 2 --
 1 file changed, 2 deletions(-)
meta/lib/oe/copy_buildsystem.py +0 -3
index d97bf9d1b9..4998afa60f 100644
@@ -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

#3 lore raw
Quoted 3 lines · Khem Raj

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

author
#4 lore raw
Quoted 9 lines · Richard Purdie
Quoted 3 lines · Khem Raj

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

Quoted 6 lines

Cheers,

Richard