Skip to content

Reverts kernel bump + patch#55092

Merged
samueldr merged 2 commits intoNixOS:masterfrom
samueldr:fix/revert-kernel-bump
Feb 2, 2019
Merged

Reverts kernel bump + patch#55092
samueldr merged 2 commits intoNixOS:masterfrom
samueldr:fix/revert-kernel-bump

Conversation

@samueldr
Copy link
Member

@samueldr samueldr commented Feb 2, 2019 •
edited
Loading

This affected users of the unstable branch in an "untenable" way. #54508, once merged, will allow us to catch similar regressions.

See

Hopefully we can have a resolution for the issues before the 19.03 release.

cc @peti @bachp

We don't have "unstable" release notes, but if we had some, we'd include something along the line:

The default kernel has been downgraded back to the 4.14 LTS. This will affect all the default images built by the project, especially notable the sd_card image for aarch64 has never previously been built with the 4.14 kernel. End-users of either new hardware or fussy hardware might want to verify which kernel they are using before rebuilding and rebooting to keep track of potential regressions after boot.

Please note that the new_kernel variants, which would help with this issue for users needing an installation media with a new kernel, haven't been build since the addition of ZFS to the default build for the installers. cc @grahamc / PR #51090

in job ‘nixos.***_new_kernel.***-linux’:
Linux v4.20.6 is not yet supported by zfsonlinux v0.7.12.
Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable.
  • ✔️ Fits CONTRIBUTING.md

@samueldr
Revert "linuxPackages_4_{19,20}: works around bug with overlayfs."
196af4b 
This reverts commit de86af4.

(Manual revert due to conflicts.)

See NixOS#54509

The patch is causing overlayfs to misbehave.
@samueldr
Revert "linuxPackages: 4.14 -> 4.19"
048c36c 
This reverts commit b861ebb.

The current issues (See NixOS#54509 and NixOS#48828) are causing headaches to
users of the unstable branches.
@GrahamcOfBorg GrahamcOfBorg added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Feb 2, 2019
@samueldr samueldr merged commit a10b10d into NixOS:master Feb 2, 2019
@eadwu
Copy link
Member

eadwu commented Feb 2, 2019

Seems to have broken my build for the kernel? Reverting through git revert -m 1 fixes it so I'm assuming it's because of this PR.

builder for '/nix/store/lmp0j2b4kx5nwpn1ckj43s2py7y7234k-linux-config-4.20.6.drv' failed with exit code 1; last 10 log lines:
  Hunk #1 succeeded at 48 (offset 9 lines).
  applying patch /nix/store/h4c3bag6lv3y47sbx83339xnalmlmdmg-modinst-arg-list-too-long.patch
  patching file scripts/Makefile.modinst
  Hunk #1 succeeded at 10 (offset 1 line).
  applying patch /nix/store/gmlkhdbh9z62q8y7fs5g6839923yvs4q-0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch
  patching file drivers/mmc/host/sdhci-iproc.c
  Reversed (or previously applied) patch detected!  Assume -R? [n]
  Apply anyway? [n]
  Skipping patch.
  1 out of 1 hunk ignored -- saving rejects to file drivers/mmc/host/sdhci-iproc.c.rej
cannot build derivation '/nix/store/zj6pxjc7d257mdh3vgqmnwcxhhrm0k75-linux-4.20.6.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/2fd8ghwb66zm6lscnqynryrj2cf7y2dg-nixos-system-nixos-19.03.git.4de9ef1.drv': 1 dependencies couldn't be built
[0 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/2fd8ghwb66zm6lscnqynryrj2cf7y2dg-nixos-system-nixos-19.03.git.4de9ef1.drv' failed

@samueldr
Copy link
Member Author

samueldr commented Feb 2, 2019 •
edited
Loading

Ugh, I made a mistake in the rebase with master. Sorry for misattributing the failure.

@samueldr is it possible to build the kernel before mergint PRs?

@samueldr
Copy link
Member Author

samueldr commented Feb 2, 2019 •
edited
Loading

Just pushed 09af2fb. Verified to build.

@samueldr samueldr deleted the fix/revert-kernel-bump branch February 2, 2019 19:32
@bachp
Copy link
Member

bachp commented Feb 7, 2019 •
edited
Loading

Moving back to 4.14 seems to break zram support because #52991 changed the default to zstd. Which is missing in 4.14.

@danbst
Copy link
Contributor

danbst commented Feb 21, 2019

crap. Time to revert relese notes

@danbst danbst mentioned this pull request Mar 4, 2019
Merged
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) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@samueldr @eadwu @bachp @danbst @GrahamcOfBorg