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

kexectools: fix build on i686 #68380

Closed
wants to merge 1 commit into from
Closed

kexectools: fix build on i686 #68380

wants to merge 1 commit into from

Conversation

worldofpeace
Copy link
Contributor

https://hydra.nixos.org/build/99957229
See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298

Motivation for this change

#68361
(maybe gnome3 tests failing on i686)

Not sure how to verify my change on that platform.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Sep 9, 2019
@ivan
Copy link
Member

ivan commented Sep 10, 2019

@GrahamcOfBorg build kexectools

ivan
ivan approved these changes Sep 10, 2019
View reviewed changes
Copy link
Member

@ivan ivan left a comment

Choose a reason for hiding this comment

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

I tested this with nix-env --argstr system i686-linux -iA kexectools on release-19.09 and confirm that it unbreaks the build.

@worldofpeace
Copy link
Contributor Author

Merged to staging in dc051df
and staging-19.09 in b0b3b29

@worldofpeace worldofpeace deleted the kexectools-fixbuild branch September 10, 2019 02:33
@delroth
Copy link
Contributor

delroth commented Sep 11, 2019

Can this be moved to staging-next or considered for a fast merge to master? There's quite a lot that's broken without this fix (e.g. any desktop config with 32 bit support enabled, or steam).

@worldofpeace
Copy link
Contributor Author

cc @FRidh @vcunat for staging manipulations.

@tadeokondrak tadeokondrak mentioned this pull request Sep 11, 2019
Closed
@ghost ghost mentioned this pull request Sep 12, 2019
Closed
10 tasks
@ghost
Copy link

ghost commented Sep 13, 2019

I also request this PR to be merged to master bacause, as said by @delroth, some packages like appimage-run and steam are broken on master.

vcunat pushed a commit that referenced this pull request Sep 14, 2019
@worldofpeace @vcunat
kexectools: fix build on i686
a715aa7 
https://hydra.nixos.org/build/99957229
See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298

Forward-cherry picked from commit dc051df, but only conditionally
for i686 to rebuild only where necessary.  Discussion: PR #68380.
@vcunat
Copy link
Member

vcunat commented Sep 14, 2019

Worked around the temporary "rebuild conflict" by a715aa7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ivan ivan ivan approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@worldofpeace @ivan @delroth @vcunat