Skip to content

meta-rauc: Currency merge with upstream hardknott branch#2

Merged
amstewart merged 2 commits intoni:nilrt/master/hardknottfrom
gratian:dev/nilrt/master/hardknott-upstream-merge
May 2, 2022
Merged

meta-rauc: Currency merge with upstream hardknott branch#2
amstewart merged 2 commits intoni:nilrt/master/hardknottfrom
gratian:dev/nilrt/master/hardknott-upstream-merge

Conversation

@gratian
Copy link

@gratian gratian commented Apr 25, 2022

This is the 2022Q2.1 currency merge with upstream hardknott branch.
There were no merge conflicts and no additional NI-specific patches are required.

Testing

  • bitbake packagefeed-ni-core
  • bitbake packagegroup-ni-desirable
  • bitbake nilrt-safemode-rootfs
  • bitbake nilrt-runmode-rootfs
  • bitbake nilrt-base-system-image
  • bitbake nilrt-recovery-media

Upstream ref: hardknott
AzDO 1848521

Procedural note
Maintainers please wait to pull this until PRs to other hardknott layers are ready.
Currently tracking one upstream issue in meta-openembedded, PR 569

@ni/rtos

ejoerns and others added 2 commits April 11, 2022 15:00
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
(cherry-picked from commit 67aa9d2)
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
…ardknott

Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
@gratian
Copy link
Author

gratian commented Apr 25, 2022

Attn: @amstewart @shruthi-ravi

Btw. I would have set reviewers/assignees directly but I don't seem to have the required permissions for this repo.

Copy link

@shruthi-ravi shruthi-ravi left a comment

Choose a reason for hiding this comment

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

Permissions updated here and in the other repos you mentioned.

@amstewart amstewart merged commit 6631560 into ni:nilrt/master/hardknott May 2, 2022
@gratian gratian deleted the dev/nilrt/master/hardknott-upstream-merge branch May 2, 2022 20:37
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.

4 participants