Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

build: fix x86 builds #2926

Merged
merged 1 commit into from
Jul 19, 2016
Merged

build: fix x86 builds #2926

merged 1 commit into from
Jul 19, 2016

Conversation

monstermunchkin
Copy link
Contributor

@monstermunchkin monstermunchkin commented Jul 13, 2016

This PR fixes a minor issue which leads to x86 builds failing.

The GOARCH environment variable should be 386 instead of i386.

@ghost
Copy link

ghost commented Jul 13, 2016

Can one of the admins verify this patch?

@lucab
Copy link
Member

lucab commented Jul 13, 2016

ok to test

@glevand
Copy link
Contributor

glevand commented Jul 13, 2016

This looks OK for now, but the value of interpBin is really dependent on the source files used to create the stage1 image, and in general could be different for the different stage1 flavors. I'm thinking now that having these init_linux files could be problematic, and that maybe the solution is to have interpBin set by the build at configure or make.

@lucab
Copy link
Member

lucab commented Jul 14, 2016

The configure.ac fix is definitely a good catch, but I'm not sure I understand the other commit. interpBin is only used by stage1-coreos flavor and CoreOS (the distro) doesn't have x86 images. Why is it being added here?

Other than that, I agree with @glevand remark that interpBin constant should be coming from somewhere like usr_from_coreos.mk

@monstermunchkin
Copy link
Contributor Author

I added the iterpBin constant here because the x86 build fails otherwise. Moving this constant out of init_*.go sounds like a good idea though. This was more of a quick fix.

Should I then just remove the second commit, and fix it in another PR?

@lucab
Copy link
Member

lucab commented Jul 17, 2016

Should I then just remove the second commit, and fix it in another PR?

Yes, please. It doesn't make much sense to keep multiplying files for architectures that don't even need it. amd64 & arm64 should be set via specific built-time constants, passing a default placeholder for the rest.

On x86 machines, GOARCH should be '386', not 'i386'.

Signed-off-by: Thomas Hipp <thipp@suse.de>
@monstermunchkin monstermunchkin changed the title build,stage1/init: fix x86 builds build: fix x86 builds Jul 18, 2016
@monstermunchkin
Copy link
Contributor Author

I have removed the 2nd commit.

@lucab
Copy link
Member

lucab commented Jul 19, 2016

LGTM

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.

4 participants