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

Update systemd and unbreak staging #37647

Merged
merged 3 commits into from
Mar 22, 2018
Merged

Update systemd and unbreak staging #37647

merged 3 commits into from
Mar 22, 2018
+17 −16

Conversation

abbradar
Copy link
Member

@abbradar abbradar commented Mar 22, 2018 •
edited
Loading

Motivation for this change

Fix current staging problems by updating systemd and fix other packages around.

Fixes #36918.

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.

Tested by building a near-empty VM. Upstream systemd bug report related to CGROUP_NET_PRIO is coming.

Sorry, something went wrong.

abbradar added 2 commits March 22, 2018 22:15
@abbradar
kernel: enable CGROUP_NET_PRIO
e31c3f8 
It's required by systemd 238 because of a bug, otherwise systemd aborts.
@abbradar
btrfs-progs: fix build with new e2fsprogs
26256ea
@abbradar abbradar added 1.severity: mass-rebuild This PR causes a large number of packages to rebuild 2.status: work-in-progress This PR isn't done labels Mar 22, 2018
@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 22, 2018
@abbradar
Copy link
Member Author

abbradar commented Mar 22, 2018 •
edited
Loading

Changes in systemd: removed NixOS/systemd@0a69f1d along with NixOS/systemd@74e8210 , added a patch on top to fix build with new libgpg-error.

https://github.com/abbradar/systemd/tree/nixos-v238 this should be pushed to a new branch in NixOS/systemd.

cc @fpletz

@abbradar
Copy link
Member Author

@GrahamcOfBorg build systemd

@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: systemd

Partial log (click to expand)

Cannot nix-instantiate `systemd' because:
�[31;1merror:�[0m while evaluating 'callPackageWith' at �[1m/private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix�[0m:113:35, called from �[1m/private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix�[0m:13864:13:
while evaluating 'makeOverridable' at �[1m/private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix�[0m:72:24, called from �[1m/private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix�[0m:117:8:
while evaluating anonymous function at �[1m/private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/systemd/default.nix�[0m:1:1, called from �[1m/private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix�[0m:74:12:
assertion failed at �[1m/private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/systemd/default.nix�[0m:15:1

@abbradar abbradar removed the 2.status: work-in-progress This PR isn't done label Mar 22, 2018
@fpletz fpletz added this to the 18.03 milestone Mar 22, 2018
fpletz
fpletz approved these changes Mar 22, 2018
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Code changes LGTM. I'm giving this a spin on 18.03 now.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: systemd

Partial log (click to expand)

gzipping man pages under /nix/store/phakkj9yz35czvj3l5aa02hgj7r79ab1-systemd-238-man/share/man/
strip is /nix/store/v4mdyzyvl3adg3wsr7v0z5l3sp192kin-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/phakkj9yz35czvj3l5aa02hgj7r79ab1-systemd-238-man
checking for references to /build in /nix/store/phakkj9yz35czvj3l5aa02hgj7r79ab1-systemd-238-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/88qzq81x2bnz9fmmygsj08ympd3fp2wb-systemd-238-dev
strip is /nix/store/v4mdyzyvl3adg3wsr7v0z5l3sp192kin-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/88qzq81x2bnz9fmmygsj08ympd3fp2wb-systemd-238-dev/lib
patching script interpreter paths in /nix/store/88qzq81x2bnz9fmmygsj08ympd3fp2wb-systemd-238-dev
checking for references to /build in /nix/store/88qzq81x2bnz9fmmygsj08ympd3fp2wb-systemd-238-dev...
/nix/store/00lfkhi73ahybx6pz4ix8s8r54f6k44y-systemd-238

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: systemd

Partial log (click to expand)

patching script interpreter paths in /nix/store/5qk1anhb954s9a90aag8iisqhxs69yry-gnutls-3.6.2-man
checking for references to /build in /nix/store/5qk1anhb954s9a90aag8iisqhxs69yry-gnutls-3.6.2-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/mfqxrmbbzjjzsbdvhzhz8lwlc7ysks4f-gnutls-3.6.2-devdoc
gzipping man pages under /nix/store/mfqxrmbbzjjzsbdvhzhz8lwlc7ysks4f-gnutls-3.6.2-devdoc/share/man/
strip is /nix/store/fzawmqln44kzgaf4x36h1wycfsamgnnl-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/mfqxrmbbzjjzsbdvhzhz8lwlc7ysks4f-gnutls-3.6.2-devdoc
checking for references to /build in /nix/store/mfqxrmbbzjjzsbdvhzhz8lwlc7ysks4f-gnutls-3.6.2-devdoc...
cannot build derivation '/nix/store/v9gzlgiribh8g5kkd8kvbkn5bfm8p6pl-libmicrohttpd-0.9.59.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/yr86na157n1jnpv07qmm0vg3i138d297-systemd-238.drv': 3 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/yr86na157n1jnpv07qmm0vg3i138d297-systemd-238.drv' failed

@abbradar
Copy link
Member Author

Reported upstream: systemd/systemd#8556

@abbradar
Copy link
Member Author

aarch64-linux issue seems to be unrelated to the update; not sure how to fix it.

@matthewbauer matthewbauer added 2.status: work-in-progress This PR isn't done and removed 2.status: work-in-progress This PR isn't done labels Mar 22, 2018
@abbradar abbradar merged commit 91072b7 into NixOS:staging Mar 22, 2018
@abbradar
Copy link
Member Author

@matthewbauer This should unbreak x86 on staging, I'll try to help with aarch64 separately.

@fpletz fpletz mentioned this pull request Mar 22, 2018
Closed
@fpletz
Copy link
Member

fpletz commented Mar 23, 2018

Hrm, apparently the old predictable interface naming from pre-17.09 is back: https://hydra.nixos.org/build/71743537/log/tail

@fpletz fpletz changed the title [WIP] Update systemd and unbreak staging Update systemd and unbreak staging Mar 23, 2018
@fpletz
Copy link
Member

fpletz commented Mar 23, 2018

Just checked: The systemd update is triggering the predictable interface names change, not the kernel config change. 😕

@abbradar
Copy link
Member Author

Ugh. I found potentially breaking commits; investigating.

@abbradar
Copy link
Member Author

abbradar commented Mar 23, 2018 •
edited
Loading

@fpletz systemd/systemd@73fc96c#r176675065 found the offending change (notice that it was done in logging improvements ~_~). It seems from the code the previous naming has been a bug! We can wait for upstream comments I guess.

@abbradar
Copy link
Member Author

Also if we don't want to change the behavior this late in the release cycle we can revert this one line specifically in 18.03 -- I've confirmed that it reverts names to the old (post-17.09) ones.

This was referenced Mar 24, 2018
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz

Assignees
No one assigned
Labels
1.severity: mass-rebuild This PR causes a large number of packages to rebuild 2.status: work-in-progress This PR isn't done 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 501+
Projects
None yet
Milestone
18.03
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@abbradar @GrahamcOfBorg @fpletz @matthewbauer