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.

Sign up for GitHub

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

Jump to bottom

Port to Pyro #122

Merged
merged 11 commits into from Oct 24, 2017
Merged

Port to Pyro #122

merged 11 commits into from Oct 24, 2017

Conversation

willnewton
Copy link
Contributor

No description provided.

@willnewton
Copy link
Contributor Author

This also requires this upstream Poky bug to be fixed:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=12045

floion
floion reviewed Sep 7, 2017
View reviewed changes
layers/meta-resin-raspberrypi/conf/samples/local.conf.sample Outdated
@@ -62,3 +62,5 @@ BB_DISKMON_DIRS = "\
ABORT,${SSTATE_DIR},100M,1K"

CONF_VERSION = "1"

HOSTTOOLS += "docker"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you point to some docs on the usage of this var? Or maybe detail on it in the git log?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

http://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-HOSTTOOLS

It looks like Pyro is strict about what host binaries are allowed to be called from recipes.

@willnewton
Copy link
Contributor Author

@resin-jenkins retest this please

@willnewton
Copy link
Contributor Author

Still required before this is no longer WIP:

  1. meta-resin release
  2. Upstream poky fix for Go binaries

@willnewton willnewton mentioned this pull request Sep 8, 2017
Closed
agherzan
agherzan reviewed Sep 8, 2017
View reviewed changes
layers/meta-resin-raspberrypi/conf/layer.conf
overlays/dpi18.dtbo \
overlays/dpi24.dtbo \
overlays/dwc2.dtbo \
overlays/dwc-otg.dtbo \
overlays/enc28j60.dtbo \
overlays/enc28j60-spi2.dtbo \
overlays/fe-pi-audio.dtbo \
overlays/goodix.dtbo \
Copy link
Contributor

Choose a reason for hiding this comment

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

Very nice!

@willnewton
Copy link
Contributor Author

The current status of this PR:

  1. One more meta-resin release is required (to include c7677d8)
  2. Get goarch.bbclass fix merged to poky upstream pyro branch (already accepted for master)

@willnewton
Copy link
Contributor Author

Current status: still waiting for upstream fix for GOARM setting. It has been accepted for the pyro branch but not yet applied to it.

@floion
Copy link
Collaborator

floion commented Oct 8, 2017

@willnewton any blockers left for this PR to get merged?

@willnewton
Copy link
Contributor Author

@floion its still blocked on fixing goarch.bbclass to get the value of GOARM set correctly. Merged as is it would work for rpi3 but break on rpi (as Go binaries would be built for ARMv7 on all platforms).

The two solutions I am aware of are:

  1. Wait for upstream to merge the fix to the pyro branch of poky (it will get there but no idea when)
  2. I copied a fixed goarch.bbclass to meta-resin/meta-resin-pyro but that doesn't work. Classes are looked up in the order of BBLAYERS which is currently alphabetically ordered so we cannot override the classes in poky with classes in meta-resin unless we reorder the list in bblayers.conf.sample. We could do that as a short term hack until the upstream commit is merged but it feels ugly.

@shaunmulligan
Copy link

@floion or @agherzan do either of you have a better solution that .2) that @willnewton proposed? would be good to get the kernel and firmware changes out to users

@floion
Copy link
Collaborator

floion commented Oct 11, 2017

I would like for #1 to be done. Can we re-ping the yocto guys and ask for a probable date when this gets in @willnewton?

Will Newton added 9 commits October 24, 2017 15:57
poky: Update to Pyro
f37c840 
Signed-off-by: Will Newton <willn@resin.io>
meta-openembedded: Update to Pyro
bf856fc 
Signed-off-by: Will Newton <willn@resin.io>
meta-raspberrypi: Update to Pyro
e100cf9 
Signed-off-by: Will Newton <willn@resin.io>
oe-meta-go: Remove after Pyro upgrade
3eaaaa8 
Signed-off-by: Will Newton <willn@resin.io>
meta-rust: Update to Pyro
172027a 
Signed-off-by: Will Newton <willn@resin.io>
bblayers.conf.sample: Switch to Pyro layers
f30df9a 
Signed-off-by: Will Newton <willn@resin.io>
local.conf.sample: Add docker to HOSTTOOLS
75a6d5d 
Also iptables which is required by dockerd.

Signed-off-by: Will Newton <willn@resin.io>
layer.conf: Remove references to i2s-mmap
75d0b54 
This overlay is gone in Linux 4.9 which Pyro uses for all machine
types.

Signed-off-by: Will Newton <willn@resin.io>
layer.conf: Update list of overlays
7ebf954 
Update the list of overlays to match the kernel sources.

Signed-off-by: Will Newton <willn@resin.io>
Will Newton added 2 commits October 24, 2017 15:58
Update Yocto version in coffeescript
b1e4b81 
Signed-off-by: Will Newton <willn@resin.io>
CHANGELOG.md: Add entry for Pyro update
a684065 
Signed-off-by: Will Newton <willn@resin.io>
@willnewton willnewton changed the title WIP: Port to Pyro Port to Pyro Oct 24, 2017
@willnewton
Copy link
Contributor Author

This should now be ready to merge, pending builds and review.

@agherzan
Copy link
Contributor

@willnewton please give us an update on what happened with the poky patch, please.

@willnewton
Copy link
Contributor Author

@agherzan The required patch was merged to the upstream pyro branch here: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=pyro&id=50cc15335ebcdfa2a2fc52c11fa01695dfdb9e26

@agherzan
Copy link
Contributor

That brings me joy and happiness. Both in the same time.

@floion floion merged commit 282a3f6 into master Oct 24, 2017
@floion floion deleted the pyro branch October 24, 2017 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agherzan agherzan agherzan left review comments

@floion floion floion approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@willnewton @floion @shaunmulligan @agherzan