aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMani Selvaraj <mani_selvaraj@comcast.com>2021-06-24 16:35:13 +0000
committerKhem Raj <raj.khem@gmail.com>2021-08-19 09:41:38 -0700
commitcddadde93363f7f1f46f6f8aff8890dab1273ed1 (patch)
tree4773a6412d8a744014d6f6da4a96c91aa3a84a0c
parent05a1d22f1071f257ee73265c7bd8e3ba8f717c0b (diff)
downloadopenembedded-core-contrib-cddadde93363f7f1f46f6f8aff8890dab1273ed1.tar.gz
openembedded-core-contrib-cddadde93363f7f1f46f6f8aff8890dab1273ed1.tar.bz2
openembedded-core-contrib-cddadde93363f7f1f46f6f8aff8890dab1273ed1.zip
esdk: locked sig mismatch warnings when build from esdk env
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 <mani_selvaraj@comcast.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/lib/oe/copy_buildsystem.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index d97bf9d1b98..4998afa60f3 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)