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

os-prober: fix dependencies for version >= 1.75 #41133

Merged
merged 4 commits into from May 31, 2018
Merged

os-prober: fix dependencies for version >= 1.75 #41133

merged 4 commits into from May 31, 2018

Conversation

symphorien
Copy link
Member

Motivation for this change

os-prober's dependencies have changed since version 1.75. As a result, os-prober didn't work anymore on my system. The mechanism relying on lvm has been dropped in favor of grub-mount [1]. grub2 was not built with grub-mount enabled, so I added the relevant configure flags.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860833#23

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) : installer.nix fails for grub1 only (I didn't touch grub1 ?!?)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip" nox-review want to rebuild os-query (why?) and fails, but this is unrelated I think
  • Tested execution of all binary files (usually in ./result/bin/) (of os-prober, not grub)
  • Fits CONTRIBUTING.md.

@symphorien
grub2: compile grub-mount as well
3e09239 
It is a dependency of os-prober >= 1.75
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860833#23
@symphorien
os-prober: switch to a non-transient url
b04f9b7 
pool urls get removed after some time
@symphorien
os-prober: fix dependencies
f8d08ec 
busybox seems to have never been needed
systemd was meant to provide udevadm; use libudev instead
devicemapper is now uneeded, replaced by grub-mount and grub-info
dmraid does not appear in the current code
@symphorien
os-prober: add symphorien as maintainer
b8ea160
@xeji
Copy link
Contributor

xeji commented May 31, 2018

@GrahamcOfBorg build os-prober

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: os-prober

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: os-prober

Partial log (click to expand)

/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/lib/linux-boot-probes/mounted/40grub2: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/lib/linux-boot-probes/50mounted-tests: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/lib/os-probes/init/10filesystems: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/lib/os-probes/mounted/90linux-distro: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/lib/os-probes/mounted/40lsb: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/lib/os-probes/50mounted-tests: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/bin/linux-boot-prober: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76/bin/os-prober: interpreter directive changed from "/bin/sh" to "/nix/store/vnb8q2h7951gd551nm2vq2g6n8296g5b-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76...
/nix/store/ws49vahw8r2971cbscwbwdkp2fmhzbdw-os-prober-1.76

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: os-prober

Partial log (click to expand)

/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/os-probes/mounted/efi/10elilo: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/os-probes/mounted/efi/20microsoft: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/os-probes/mounted/20macosx: interpreter directive changed from "/bin/sh -e" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh -e"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/os-probes/init/10filesystems: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/linux-boot-probes/50mounted-tests: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/linux-boot-probes/mounted/40grub2: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/linux-boot-probes/mounted/90fallback: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/linux-boot-probes/mounted/40grub: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
/nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76/lib/linux-boot-probes/mounted/50lilo: interpreter directive changed from "/bin/sh" to "/nix/store/m47apl3hq3i52fzy2cz24378p0xn4lyx-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/mk39m7psdgd0vq3v39r7kxarp93bvq9f-os-prober-1.76...

@xeji xeji merged commit f7a96ae into NixOS:master May 31, 2018
@symphorien symphorien deleted the os-prober branch March 21, 2020 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@symphorien @xeji @GrahamcOfBorg