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

Dockerfile_yocto-build-env: Add screen #317

Merged

Conversation

ajlennon
Copy link
Contributor

@ajlennon ajlennon commented Oct 6, 2023

To enable us to use bitbake -c devshell foo in container

@ajlennon
Copy link
Contributor Author

ajlennon commented Oct 7, 2023

@alexgg could anybody take a quick look please?

@alexgg
Copy link
Collaborator

alexgg commented Oct 9, 2023

@ajlennon would you please add a Change-type: patch footer? The CI needs this to pass.

@ajlennon ajlennon force-pushed the ajl/add-screen-to-build-container branch from d957f6b to 7d99942 Compare October 10, 2023 12:10
@ajlennon
Copy link
Contributor Author

Done @alexgg

@alexgg
Copy link
Collaborator

alexgg commented Oct 10, 2023

Pending on #318

@alexgg
Copy link
Collaborator

alexgg commented Oct 10, 2023

thanks @ajlennon sorry to bother you again - would you mind rebasing over master again? I had to enable external contributions to this repository in our CI/CD system.

@ajlennon
Copy link
Contributor Author

I just clicked "Update branch" here. Did that help? :)

@alexgg
Copy link
Collaborator

alexgg commented Oct 10, 2023

sorry @ajlennon needs to be a rebase - you may have an Update with rebase, but now you will need to do a manual rebase and force push.

Error: Latest commit appears to be a merge, which is currently unsupported. Try a rebase instead.

To enable us to use `bitbake -c devshell foo` in container

Change-type: patch
Signed-off-by: Alex J Lennon <[email protected]>
@ajlennon ajlennon force-pushed the ajl/add-screen-to-build-container branch from 43e9ce5 to 7ca8164 Compare October 10, 2023 13:09
@ajlennon
Copy link
Contributor Author

Rebasing always scares me a bit. OK how about now?

@alexgg
Copy link
Collaborator

alexgg commented Oct 10, 2023

lgtm

@alexgg alexgg merged commit dc0df16 into balena-os:master Oct 10, 2023
46 checks passed
@ajlennon
Copy link
Contributor Author

Hurray! Thanks for bearing with me!

@ajlennon ajlennon deleted the ajl/add-screen-to-build-container branch October 10, 2023 13:49
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.

2 participants