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

linux_mptcp: 0.94 -> 0.94.1 [RDY] #47601

Merged
merged 1 commit into from Oct 15, 2018
Merged

linux_mptcp: 0.94 -> 0.94.1 [RDY] #47601

merged 1 commit into from Oct 15, 2018

Conversation

teto
Copy link
Member

@teto teto commented Oct 1, 2018 •
edited

Prevents from overriding the wrong kernel.

Motivation for this change

When switching across branches, linux_mptcp would mean a diffferent kernel. It's easier to override the correct kernel with a fully qualified attribute.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: linux_mptcp

Partial log (click to expand)

these paths will be fetched (48.28 MiB download, 79.17 MiB unpacked):
  /nix/store/z106vi92lhq7lfd1n15x1ss5ini53apx-linux-4.14.24-mptcp_v0.94
copying path '/nix/store/z106vi92lhq7lfd1n15x1ss5ini53apx-linux-4.14.24-mptcp_v0.94' from 'https://cache.nixos.org'...
/nix/store/z106vi92lhq7lfd1n15x1ss5ini53apx-linux-4.14.24-mptcp_v0.94

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: linux_mptcp

Partial log (click to expand)

these paths will be fetched (53.70 MiB download, 61.63 MiB unpacked):
  /nix/store/ssiwszrjvdhi1ck11hzz9isq1y3ldcmj-linux-4.14.24-mptcp_v0.94
copying path '/nix/store/ssiwszrjvdhi1ck11hzz9isq1y3ldcmj-linux-4.14.24-mptcp_v0.94' from 'https://cache.nixos.org'...
/nix/store/ssiwszrjvdhi1ck11hzz9isq1y3ldcmj-linux-4.14.24-mptcp_v0.94

@teto
linux_mptcp: 0.94 -> 0.94.1
3c94e47 
Also introduce linux_mptcp_94 alias to prevent from overriding the wrong kernel
when switching across branches.

test
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: linux_mptcp

Partial log (click to expand)

wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
cannot find section .dynamic
/nix/store/nvywdxjvc1d49c7vicfnm1qjv1c9nmmn-linux-4.14.70-mptcp_v0.94.1

@teto
Copy link
Member Author

teto commented Oct 2, 2018

at first I just wanted to add a fully qualified name but then I added an update from 0.94 to 0.94.1.

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: linux_mptcp

Partial log (click to expand)

  CC [M]  drivers/gpio/gpio-xra1403.o
  CC      drivers/gpu/drm/drm_mipi_dsi.o
  AR      drivers/gpu/drm/amd/amdgpu/built-in.o
  CC [M]  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o
  CC [M]  drivers/gpu/drm/amd/amdgpu/amdgpu_device.o
  CC [M]  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.o
  CC [M]  drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.o
  CC [M]  drivers/gpu/drm/amd/amdgpu/atombios_crtc.o
building of '/nix/store/kzvfrij2znam3hsk655fbvw66d77ripv-linux-4.14.70-mptcp_v0.94.1.drv' timed out after 3600 seconds
error: build of '/nix/store/kzvfrij2znam3hsk655fbvw66d77ripv-linux-4.14.70-mptcp_v0.94.1.drv' failed

@teto teto changed the title linux_mptcp: add linux_mptcp_94 linux_mptcp: 0.94 -> 0.94.1 [RDY] Oct 15, 2018
@joachifm joachifm merged commit 6c60014 into NixOS:master Oct 15, 2018
@teto teto deleted the mptcp_94 branch October 15, 2018 11:32
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
8.has: package (new) 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
@teto @GrahamcOfBorg @joachifm