Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meta-lxatac-bsp: emmc-image: specify image for state/env even with fill: #120

Merged
merged 1 commit into from
Mar 8, 2024

Conversation

hnez
Copy link
Member

@hnez hnez commented Mar 4, 2024

This fixes failing builds caused by commit daccfdd ("meta-ptx: update to current master with genimage v17") in PR #117, which removed the image parameter for the barebox state and environment partition in the assumption that specifying the fill parameter instead would result in the partition being zeroed out.

This is not correct. genimage still needs an image name for the partition, but now it may have a length of zero because the rest of the partition (e.g. everything) will be filled with zeros.

This fixes these genimage build errors:

| INFO: cmd: "rm -rf "…/build/tmp/work/lxatac-oe-linux-gnueabi/emmc-image/1.0/genimage-tmp"/*" (stderr):
| INFO: android-sparse(emmc-image-lxatac-2024…15.simg): input image: emmc-image-lxatac-2024…15.img
| ERROR: hdimage(emmc-image-lxatac-2024…15.img): no input file given
| INFO: cmd: "rm -rf "…/build/tmp/work/lxatac-oe-linux-gnueabi/emmc-image/1.0/genimage-tmp"/*" (stderr):
| WARNING: exit code 1 from a shell command.

This fixes failing builds caused by commit daccfdd ("meta-ptx: update
to current master with genimage v17"), which removed the image parameter
for the barebox state and environment partition in the assumption that
specifying the fill parameter instead would result in the partition
being zeroed out.

This is not correct. genimage still needs an image name for the partition,
but now it may have a length of zero because the rest of the partition
(e.g. everything) will be filled with zeros.

This fixes these genimage build errors:

  | INFO: cmd: "rm -rf "…/build/tmp/work/lxatac-oe-linux-gnueabi/emmc-image/1.0/genimage-tmp"/*" (stderr):
  | INFO: android-sparse(emmc-image-lxatac-2024…15.simg): input image: emmc-image-lxatac-2024…15.img
  | ERROR: hdimage(emmc-image-lxatac-2024…15.img): no input file given
  | INFO: cmd: "rm -rf "…/build/tmp/work/lxatac-oe-linux-gnueabi/emmc-image/1.0/genimage-tmp"/*" (stderr):
  | WARNING: exit code 1 from a shell command.

Fixes: daccfdd ("meta-ptx: update to current master with genimage v17")
Signed-off-by: Leonard Göhrs <[email protected]>
@hnez hnez added this to the second stable release milestone Mar 4, 2024
@hnez hnez requested a review from ejoerns March 4, 2024 06:40
@jluebbe jluebbe merged commit 4385047 into linux-automation:nanbield Mar 8, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants