10000 build,stage1/init: set interpBin at build time for src flavor by iaguis · Pull Request #2978 · rkt/rkt · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Feb 24, 2020. It is now read-only.

build,stage1/init: set interpBin at build time for src flavor #2978

Merged
merged 1 commit into from
Jul 26, 2016

Conversation

iaguis
Copy link
Member
@iaguis iaguis commented Jul 25, 2016

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

[amd64],
[RKT_STAGE1_COREOS_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])])
[RKT_STAGE1_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])])
Copy link
Member

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?

Copy link
Member Author

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.

@alban
Copy link
Member
alban commented Jul 25, 2016

Thanks for this, it was annoying that it was broken.

@iaguis
Copy link
Member Author
iaguis commented Jul 25, 2016

Updated.

8000

[RKT_STAGE1_INTERPRETER="/lib64/ld-linux-aarch64.so.1"],
[amd64],
[RKT_STAGE1_INTERPRETER="/lib64/ld-linux-x86-64.so.2"])])

Copy link
Member

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?).

Copy link
Member Author
@iaguis iaguis Jul 25, 2016

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.

Copy link
Member

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.
@iaguis iaguis force-pushed the iaguis/fix-src-flavor branch from 311012b to 7db0589 Compare July 25, 2016 17:20
@lucab
Copy link
Member
lucab commented Jul 25, 2016

LGTM. The CI setup for src flavor is still unfinished (my bad) but I trust this should work.

@lucab lucab self-assigned this Jul 25, 2016
@iaguis iaguis merged commit 7b3cada into rkt:master Jul 26, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0