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

systemd: 250.3 -> 250.4 #165411

Merged
merged 1 commit into from
Mar 23, 2022
Merged

systemd: 250.3 -> 250.4 #165411

merged 1 commit into from
Mar 23, 2022

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Mar 23, 2022 •
edited
Loading

Among other things fixes build failure on linux-headers-5.17:

../src/basic/meson.build:389:8: ERROR: Problem encountered: found unknown filesystem(s) defined in kernel headers:

Filesystem found in kernel header but not in filesystems-gperf.gperf: CIFS_SUPER_MAGIC
Filesystem found in kernel header but not in filesystems-gperf.gperf: SMB2_SUPER_MAGIC
Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi
systemd: 250.3 -> 250.4
35e2c61 
Among other things fixes build failure on linux-headers-5.17:

    ../src/basic/meson.build:389:8: ERROR: Problem encountered: found unknown filesystem(s) defined in kernel headers:

    Filesystem found in kernel header but not in filesystems-gperf.gperf: CIFS_SUPER_MAGIC
    Filesystem found in kernel header but not in filesystems-gperf.gperf: SMB2_SUPER_MAGIC
@trofi trofi requested a review from a team as a code owner March 23, 2022 08:45
@trofi trofi mentioned this pull request Mar 23, 2022
Merged
13 tasks
@ofborg ofborg bot requested review from Mic92, flokli and kloenk March 23, 2022 11:29
@flokli
Copy link
Contributor

flokli commented Mar 23, 2022 •
edited
Loading

I can't really test this right now, as elfutils (dependency of systemd) doesn't build in staging (and staging-next): #160259 (comment)

@flokli
Copy link
Contributor

flokli commented Mar 23, 2022

I did do a local revert of that PR and will now try to build 250.4 again.

@flokli
Copy link
Contributor

flokli commented Mar 23, 2022

I successfully built this, and ran some VM tests. Let's get this in!

@flokli flokli merged commit 5f3ab4f into NixOS:staging Mar 23, 2022
@trofi trofi deleted the update-systemd branch March 23, 2022 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arianvp arianvp arianvp approved these changes

@Mic92 Mic92 Awaiting requested review from Mic92

@flokli flokli Awaiting requested review from flokli

@kloenk kloenk Awaiting requested review from kloenk

Assignees
No one assigned
Labels
6.topic: systemd 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@trofi @flokli @arianvp