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

qemux86: Update to scarthgap, Update to master #99

Merged
merged 5 commits into from
Jun 6, 2024

Conversation

ejoerns
Copy link
Member

@ejoerns ejoerns commented May 23, 2024

In a two-step process, this first updates to be compatible with scarthgap to just remove the compatibility in a second step that updates to master/styhead. This will allow us to test all changes against master while it allows us to split up the scarthgap branch easily.

  • Increases wic partition sizes
  • Migrates to new rauc-conf.bb
  • Sets compatibility to 'scarthgap'
  • remove 'scarthgap' compatibility
  • apply UNPACKDIR changes

ejoerns added 5 commits May 23, 2024 18:45
The current core-image-minimal size for the suggested configuration
seems to be too close to 150M and test images fail to boot.
Fix this by adding 50M more for each rootfs partition.

There is also no need to pre-populate the inactive rootfs, thus use
--source empty here.

Signed-off-by: Enrico Jorns <[email protected]>
With meta-rauc commit d51bab8f ("rauc: split package into 'rauc' for
binary and 'rauc-conf' for configuration"), the platform-specific
configuration was moved to the rauc-conf.bb recipe.

As we only touch the configuration anyway, adapt to this by simply
renaming the .bbappend.

Signed-off-by: Enrico Jörns <[email protected]>
Due to the rauc-conf change, the layer will not be compatible with any
version before. Drop these.

Signed-off-by: Enrico Jörns <[email protected]>
We will need to do some incompatible changes now.

Signed-off-by: Enrico Jörns <[email protected]>
This reflects the recent changes in oe-core to enforce unpacking to a
subdirectory of WORKDIR.

As done in oe-core commit d9328e3b ("recipes: Switch away from S =
WORKDIR"), use explicit 'sources/' subdirectory as UNPACKDIR (and S).

Signed-off-by: Enrico Jörns <[email protected]>
@ejoerns ejoerns changed the title qemux86: Update to scarthgap qemux86: Update to scarth, Update to master May 27, 2024
@ejoerns
Copy link
Member Author

ejoerns commented May 27, 2024

Note: Still fails for master since rauc/meta-rauc#320 needs to get merged, first.

@ejoerns ejoerns changed the title qemux86: Update to scarth, Update to master qemux86: Update to scarthgap, Update to master May 27, 2024
@ejoerns ejoerns requested a review from leon-anavi June 3, 2024 17:09
@leon-anavi leon-anavi merged commit eec8238 into rauc:master Jun 6, 2024
2 checks passed
@leon-anavi
Copy link
Collaborator

Thanks for the contribution. I've merged it. Kind reminder about the rebase of #82 related to README.rst.

Thanks, Leon

@ejoerns
Copy link
Member Author

ejoerns commented Jun 25, 2024

@leon-anavi I had split this up into two parts to allow branching scarthgap in between. Now, the scarthgap branch does not allow scarthgap in qemux86 layer.conf anymore. Should I make a PR to revert the 'master-only' commits that made its way into scarthgap branch?

@leon-anavi
Copy link
Collaborator

@leon-anavi I had split this up into two parts to allow branching scarthgap in between. Now, the scarthgap branch does not allow scarthgap in qemux86 layer.conf anymore. Should I make a PR to revert the 'master-only' commits that made its way into scarthgap branch?

Yes, please. Considering WORKDIR -> UNPACKDIR transition we will have to maintain a separate scarthgap branch. I created it earlier today. Btw I rebased/backported the ongoing Rockchip as a separate GitHub PR for scarthgap.

@ejoerns ejoerns deleted the update-to-scarthgap branch June 26, 2024 08:23
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