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

[styhead] rpi-u-boot-scr: use UNPACKDIR #1329

Merged
merged 2 commits into from
May 29, 2024

Conversation

shr-project
Copy link
Contributor

Copy link
Collaborator

@kraj kraj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@shr-project shr-project changed the title rpi-u-boot-scr: use UNPACKDIR [styhead] rpi-u-boot-scr: use UNPACKDIR May 28, 2024
@shr-project
Copy link
Contributor Author

The CI build failed because this depends on #1326

Let me know if I should merge khem's changes into this one or as khem to pick these 2 commits into his, both PRs should be applied only after scarthgap is branched out.

Copy link
Owner

@agherzan agherzan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged in master before scarthgap fork. Thanks!

@agherzan agherzan enabled auto-merge (rebase) May 28, 2024 22:55
* see:
  https://lists.openembedded.org/g/openembedded-architecture/message/2007

* fixes:
  sed: can't read TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/rpi-u-boot-scr/1.0/boot.cmd.in: No such file or directory

Signed-off-by: Martin Jansa <[email protected]>
* we don't know yet what changes will be needed to stay compatible with
  final styhead, but we already know that the last changes for UNPACKDIR
  aren't compatible with scarthgap or nanbield.

Signed-off-by: Martin Jansa <[email protected]>
auto-merge was automatically disabled May 28, 2024 23:02

Head branch was pushed to by a user without write access

@shr-project
Copy link
Contributor Author

Head branch was pushed to by a user without write access

Ah, I've rebased locally and pushed updated branch after seeing khem's PR being merged.

@agherzan I'm sorry if I've messed with the CI work flow

@agherzan
Copy link
Owner

Head branch was pushed to by a user without write access

Ah, I've rebased locally and pushed updated branch after seeing khem's PR being merged.
@agherzan I'm sorry if I've messed with the CI work flow

Don't worry. Thanks for this!

@shr-project
Copy link
Contributor Author

Don't worry. Thanks for this!

No problem, I just didn't know how to restart the CI after auto-merge was removed by my push (and looks like CI is still waiting for something).

@agherzan agherzan merged commit 2174bfd into agherzan:master May 29, 2024
19 checks passed
@shr-project shr-project deleted the jansa/unpackdir branch May 29, 2024 23:34
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