-
Notifications
You must be signed in to change notification settings - Fork 880
build,stage1/init: set interpBin at build time for src flavor #2978
Conversation
[amd64], | ||
[RKT_STAGE1_COREOS_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])]) | ||
[RKT_STAGE1_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could the .so
version ever change? If so, could you add a line in update-coreos-stage1.md to say that configure.ac might need an update?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this will change in the near/mid future.
Thanks for this, it was annoying that it was broken. |
e95184a
to
311012b
Compare
Updated. |
[RKT_STAGE1_INTERPRETER="/lib64/ld-linux-aarch64.so.1"], | ||
[amd64], | ||
[RKT_STAGE1_INTERPRETER="/lib64/ld-linux-x86-64.so.2"])]) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fine for flavor coreos (which only has amd64+arm64), but src flavor can be built on any arch (taking the other bits for stage1 from host). I guess there should be a default case here, erroring out or reverting to the LSB loader (is that still a thing?).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we really care about other archs with the src flavor, it's there just for testing purposes. I'll add "src" to the unsupported archs check above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds reasonable.
The src flavor has a different interpreter path. Take advantage of the new build variable to set it for the src flavor. Also, change its name because it's not coreos flavor specific anymore.
311012b
to
7db0589
Compare
LGTM. The CI setup for src flavor is still unfinished (my bad) but I trust this should work. |
The src flavor has a different interpreter path.
Take advantage of the new build variable to set it for the src flavor.
Also, change its name because it's not coreos flavor specific anymore.
Fixes #2857
cc @alban