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.

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

modules-shrunk: preserve module priorities from build #75178

Merged
merged 1 commit into from Dec 12, 2019

Conversation

@wamserma
Copy link
Contributor

@wamserma wamserma commented Dec 7, 2019

depmod looks for files modules.order and modules.builtin which are
generated at kernel build time but were previously not passed to
the modules-shrunk derivation.

Motivation for this change
depmod: WARNING: could not open modules.order at /nix/store/fprfhcrkzbnqlivj146j57sjccm5kjpf-linux-4.19.87-modules-shrunk/lib/modules/4.19.87: No such file or directory
depmod: WARNING: could not open modules.builtin at /nix/store/fprfhcrkzbnqlivj146j57sjccm5kjpf-linux-4.19.87-modules-shrunk/lib/modules/4.19.87: No such file or directory

on nixos-rebuild.

Things done
  • Tested in production
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 @

depmod looks for files modules.order and modules.builtin which are
generated at kernel build time but were previously not passed to
the modules-shrunk derivation
@wamserma wamserma mentioned this pull request Dec 7, 2019
2 of 10 tasks complete
@wamserma wamserma mentioned this pull request Dec 7, 2019
2 of 10 tasks complete
@worldofpeace worldofpeace changed the base branch from nixos-19.09 to release-19.09 Dec 7, 2019
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Dec 7, 2019

@wamserma The branch to target backports is to release-19.09. nixos-19.09 is used for the nixos channels and can't be written to by anyone other than a bot.

@wamserma
Copy link
Contributor Author

@wamserma wamserma commented Dec 8, 2019

@worldofpeace Uh, my fault. Thanks for fixing.

@wamserma
Copy link
Contributor Author

@wamserma wamserma commented Dec 12, 2019

@andir please also here - same as #75181

@andir
Copy link
Member

@andir andir commented Dec 12, 2019

@GrahamcOfBorg test systemd

@andir andir merged commit 23902ce into NixOS:release-19.09 Dec 12, 2019
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.systemd on aarch64-linux Success
Details
tests.systemd on x86_64-linux Success
Details
@wamserma wamserma deleted the wamserma:nixos-19.09 branch Dec 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.