lmp/build: Improve license and source-code handling#370
Merged
ricardosalveti merged 3 commits intofoundriesio:masterfrom Feb 17, 2025
Merged
lmp/build: Improve license and source-code handling#370ricardosalveti merged 3 commits intofoundriesio:masterfrom
ricardosalveti merged 3 commits intofoundriesio:masterfrom
Conversation
Member
Author
|
This is not required for the scarthgap version but I discovered this when I was working on that- |
quaresmajose
force-pushed
the
lic_and_img_manifest
branch
from
230536c to
f4e7b61
Compare
quaresmajose
force-pushed
the
lic_and_img_manifest
branch
from
f4e7b61 to
2222257
Compare
ricardosalveti
approved these changes
Jan 14, 2025
Member
ricardosalveti
left a comment
ricardosalveti
left a comment
There was a problem hiding this comment.
LGTM, we just won't have a way to notify our customer of such missing file at this stage, we need to work on getting the possible fix backported to scarthgap.
Member
Author
I will try to see how to do this. |
quaresmajose
force-pushed
the
lic_and_img_manifest
branch
from
2222257 to
e337a2e
Compare
Member
Author
|
The scarthgap is broken with this and I need validate this again on both scarthgap + kirkstone |
2 tasks
- Skip lmp-mfgtool disto variant
- Fail if the image manifest not exist
- Consider only the symbolic links of the images manifest
- From the licenses deploy dir of the image:
- Copy the license.manifest, if not possible fail
- Copy the image_license.manifest
| + for img in ${DEPLOY_DIR_IMAGE}/*${MACHINE}.manifest
| ++ basename '/srv/oe/build/deploy/images/intel-corei7-64/*intel-corei7-64.manifest'
| ++ sed -e s/.manifest//
| + image_name='*intel-corei7-64'
| ++ readlink '/srv/oe/build/deploy/images/intel-corei7-64/*intel-corei7-64.manifest'
| ++ sed -e 's/\..*manifest//'
| + image_name_id=
| Script completed with error(s)
Signed-off-by: Jose Quaresma <[email protected]>
There is a bug in oe-core and sometimes the lic folder is empty. https://bugzilla.yoctoproject.org/show_bug.cgi?id=15394 The intention of this change is to document and be reverted once the problem is fixed. Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose
force-pushed
the
lic_and_img_manifest
branch
2 times, most recently
from
ae37104 to
a3a1d8a
Compare
quaresmajose
changed the title
Member
Author
Validated on both scarthgap + kirkstone ci based builds. |
On multiconfig machines the sources and the license can be duplicated. We have two places with the source-code and licenses on the ti bsp [1]. If it was the case we will deploy only one package, we will search for the first package license path and use that. We can also escape and jump this source-code collecting step when we not have any IMAGE_MANIFESTS (i.e no image produced). [1] https://github.com/foundriesio/meta-lmp/blob/7657b41046ff745ce5fe61a64f615623ebb098e0/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc#L457-L459 Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose
force-pushed
the
lic_and_img_manifest
branch
from
a3a1d8a to
842bad4
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
- License handling
Instead of blindly failing, this will improve the situation and will show up what is the missing manifests.
For the lmp-mfgtool we don't produce an image and don't make sense to processes the image manifest.
The following is an example of such blindly CI build fail:
- Source-code handling
Adding support for collecting duplicated sources
On multiconfig machines the sources and the license can be duplicated.
We have two places with the source-code and licenses on the ti bsp [1].
If it was the case we will deploy only one package, we will search for the first package license path and use that.
We can also escape and jump this source-code collecting step when we not have any IMAGE_MANIFESTS (i.e no image produced).
[1] https://github.com/foundriesio/meta-lmp/blob/7657b41046ff745ce5fe61a64f615623ebb098e0/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc#L457-L459