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

.gitmodules: update poky branch #501

Merged
merged 3 commits into from
Sep 10, 2024
Merged

.gitmodules: update poky branch #501

merged 3 commits into from
Sep 10, 2024

Conversation

alexgg
Copy link
Contributor

@alexgg alexgg commented Sep 6, 2024

We are maintaining a fork of Poky and using a branch there as source as we need to backport a bitbake patch that is still not contained in the current Yocto LTS release.

The patch in question is:
balena-os/poky@debd42b

This commit updates the branch to rebase that commit to the current kirkstone HEAD which includes security and bug fixes.

The old branch is maintained not to loose history, and a new branch has been preferred over a merge into the current one as that would only bury the backported patch making it more difficult to follow what the reasoning for the branch is.

Changelog-entry: Update Poky to kirkstone HEAD

We are maintaining a fork of Poky and using a branch there as source
as we need to backport a bitbake patch that is still not contained
in the current Yocto LTS release.

The patch in question is:
balena-os/poky@debd42b

This commit updates the branch to rebase that commit to the current
kirkstone HEAD which includes security and bug fixes.

The old branch is maintained not to loose history, and a new branch has
been preferred over a merge into the current one as that would only
bury the backported patch making it more difficult to follow what the
reasoning for the branch is.

Changelog-entry: Update Poky to kirkstone HEAD
Signed-off-by: Alex Gonzalez <alexg@balena.io>
@alexgg alexgg requested a review from acostach September 6, 2024 17:33
@flowzone-app flowzone-app bot enabled auto-merge September 6, 2024 17:40
@acostach
Copy link
Collaborator

acostach commented Sep 7, 2024

@resin-jenkins retest this please

... because the Dockerfile build in Jenkins started failing recently when
installing packages, and the last logs are a prompt for user input.

Signed-off-by: Alexandru Costache <alexandru@balena.io>
@acostach
Copy link
Collaborator

acostach commented Sep 8, 2024

SSH to DUTs is failing. Triggered #500 to see if this is caused by a change in Poky

jenkins-leviathan-v2-template-62263-client-1  | [2024-09-08T09:56:41.289Z][9e0e78e-os] connect ECONNREFUSED 127.0.0.1:22222
jenkins-leviathan-v2-template-62263-client-1  | [2024-09-08T09:56:42.288Z][9e0e78e-os] connect ECONNREFUSED 127.0.0.1:22222
jenkins-leviathan-v2-template-62263-client-1  | [2024-09-08T09:56:43.288Z][9e0e78e-os] connect ECONNREFUSED 127.0.0.1:22222

LE: this is fixed by the meta-balena update

Signed-off-by: Alexandru Costache <alexandru@balena.io>
@acostach
Copy link
Collaborator

acostach commented Sep 9, 2024

@balena-ci I self-certify!

@flowzone-app flowzone-app bot merged commit c7b2375 into master Sep 10, 2024
53 checks passed
@flowzone-app flowzone-app bot deleted the alexgg/poky-update branch September 10, 2024 14:59
acostach added a commit that referenced this pull request Oct 1, 2024
PR #501 updated gitmodules only, without changing
the poky layer head revision. Let's also update
the poky to the head revision.

Signed-off-by: Alexandru Costache <alexandru@balena.io>
acostach added a commit that referenced this pull request Oct 8, 2024
PR #501 updated gitmodules only, without changing
the poky layer head revision. Let's also update
the poky to the head revision.

Signed-off-by: Alexandru Costache <alexandru@balena.io>
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