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

libsmbios: re-enable python utilities #39022

Merged
merged 1 commit into from May 12, 2018
Merged

libsmbios: re-enable python utilities #39022

merged 1 commit into from May 12, 2018

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Apr 16, 2018

Motivation for this change

Without this the package is missing quite a few useful utilities such as smbios-thermal-ctl. With the latest package release they appear to build and work fine without any further changes.

It would be nice to backport to 18.03.

Note that when testing on a NixOS host system running glibc 2.26 they will emit errors reported in #38991. This is unrelated to this change.

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) 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: libsmbios

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libsmbios

Partial log (click to expand)

/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/smbios-wakeup-ctl: interpreter directive changed from "/usr/bin/python3" to "/nix/store/96wn2gz3mwi71gwcrvpfg39bsymd7gqx-python3-3.6.5/bin/python3"
/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/smbios-thermal-ctl: interpreter directive changed from "/usr/bin/python3" to "/nix/store/96wn2gz3mwi71gwcrvpfg39bsymd7gqx-python3-3.6.5/bin/python3"
/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/smbios-battery-ctl: interpreter directive changed from "/usr/bin/python3" to "/nix/store/96wn2gz3mwi71gwcrvpfg39bsymd7gqx-python3-3.6.5/bin/python3"
/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/smbios-keyboard-ctl: interpreter directive changed from "/usr/bin/python3" to "/nix/store/96wn2gz3mwi71gwcrvpfg39bsymd7gqx-python3-3.6.5/bin/python3"
/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/smbios-wireless-ctl: interpreter directive changed from "/usr/bin/python3" to "/nix/store/96wn2gz3mwi71gwcrvpfg39bsymd7gqx-python3-3.6.5/bin/python3"
/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/smbios-sys-info: interpreter directive changed from "/usr/bin/python3" to "/nix/store/96wn2gz3mwi71gwcrvpfg39bsymd7gqx-python3-3.6.5/bin/python3"
/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/smbios-token-ctl: interpreter directive changed from "/usr/bin/python3" to "/nix/store/96wn2gz3mwi71gwcrvpfg39bsymd7gqx-python3-3.6.5/bin/python3"
checking for references to /build in /nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1...
moving /nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/sbin/* to /nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1/bin
/nix/store/mf7j7fk9if90sqxjx6d6j05vn9y7lrhf-libsmbios-2.4.1

@Mic92
Copy link
Member

Mic92 commented Apr 21, 2018

Why was it disabled in the first place?

@pbogdan
Copy link
Member Author

pbogdan commented Apr 21, 2018

Not sure TBH, seemingly --disable-python was added in #31538 but it doesn't seem to provide a reason. /cc @c0bw3b

@Mic92
Copy link
Member

Mic92 commented Apr 22, 2018

It seems to be used only in combination with fwupd

@xeji
Copy link
Contributor

xeji commented May 12, 2018

@GrahamcOfBorg build fwupd fwupdate

@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: fwupd, fwupdate

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

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: fwupd, fwupdate

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 x86_64-linux (full log)

Attempted: fwupd, fwupdate

Partial log (click to expand)

gzipping man pages under /nix/store/b7jlvs2x2klbs60yrmwfn3mgp994r51g-fwupd-1.0.5-man/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/b7jlvs2x2klbs60yrmwfn3mgp994r51g-fwupd-1.0.5-man
checking for references to /build in /nix/store/b7jlvs2x2klbs60yrmwfn3mgp994r51g-fwupd-1.0.5-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/an297fp95ryzkwxb68an2k989w0qzk8m-fwupd-1.0.5-installedTests
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/an297fp95ryzkwxb68an2k989w0qzk8m-fwupd-1.0.5-installedTests
checking for references to /build in /nix/store/an297fp95ryzkwxb68an2k989w0qzk8m-fwupd-1.0.5-installedTests...
/nix/store/nlwi8zg9y6y70vvg4yj01sw7pm5378r2-fwupd-1.0.5
/nix/store/1wph11x4qd2m1jxrzxm4xh0vw522iqpr-fwupdate-10

@xeji xeji merged commit 78fba37 into NixOS:master May 12, 2018
@pbogdan pbogdan deleted the libsmbios-python-utils branch December 3, 2019 17:17
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
4 participants
@pbogdan @GrahamcOfBorg @Mic92 @xeji