| Message ID | 874ku5fkoq.fsf@ponder |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#40190] Linux-Libre 5.6 | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | fail | View Laminar job |
Vagrant Cascadian <vagrant@debian.org> writes: > On 2020-03-30, Vagrant Cascadian wrote: >> And the second patch, switching to 5.5... > > And a third, rougher, less well tested patch switching to 5.6... which > could obviously be squashed into the previous patches and maybe skip 5.5 > altogether. 5.5 is not an LTS kernel, so going straight to 5.6 sounds like the right thing to do. However... > diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm.conf b/gnu/packages/aux-files/linux-libre/5.6-arm.conf > similarity index 100% > rename from gnu/packages/aux-files/linux-libre/5.5-arm.conf > rename to gnu/packages/aux-files/linux-libre/5.6-arm.conf > diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm64.conf b/gnu/packages/aux-files/linux-libre/5.6-arm64.conf > similarity index 100% > rename from gnu/packages/aux-files/linux-libre/5.5-arm64.conf > rename to gnu/packages/aux-files/linux-libre/5.6-arm64.conf > diff --git a/gnu/packages/aux-files/linux-libre/5.5-i686.conf b/gnu/packages/aux-files/linux-libre/5.6-i686.conf > similarity index 100% > rename from gnu/packages/aux-files/linux-libre/5.5-i686.conf > rename to gnu/packages/aux-files/linux-libre/5.6-i686.conf > diff --git a/gnu/packages/aux-files/linux-libre/5.5-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.6-x86_64.conf > similarity index 100% > rename from gnu/packages/aux-files/linux-libre/5.5-x86_64.conf > rename to gnu/packages/aux-files/linux-libre/5.6-x86_64.conf This does not seem right. Surely there are _some_ configuration changes in 5.6?
On 2020-03-31, Marius Bakke wrote: > Vagrant Cascadian <vagrant@debian.org> writes: > >> On 2020-03-30, Vagrant Cascadian wrote: >>> And the second patch, switching to 5.5... >> >> And a third, rougher, less well tested patch switching to 5.6... which >> could obviously be squashed into the previous patches and maybe skip 5.5 >> altogether. > > 5.5 is not an LTS kernel, so going straight to 5.6 sounds like the > right thing to do. However... > >> diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm.conf b/gnu/packages/aux-files/linux-libre/5.6-arm.conf >> similarity index 100% >> rename from gnu/packages/aux-files/linux-libre/5.5-arm.conf >> rename to gnu/packages/aux-files/linux-libre/5.6-arm.conf >> diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm64.conf b/gnu/packages/aux-files/linux-libre/5.6-arm64.conf >> similarity index 100% >> rename from gnu/packages/aux-files/linux-libre/5.5-arm64.conf >> rename to gnu/packages/aux-files/linux-libre/5.6-arm64.conf >> diff --git a/gnu/packages/aux-files/linux-libre/5.5-i686.conf b/gnu/packages/aux-files/linux-libre/5.6-i686.conf >> similarity index 100% >> rename from gnu/packages/aux-files/linux-libre/5.5-i686.conf >> rename to gnu/packages/aux-files/linux-libre/5.6-i686.conf >> diff --git a/gnu/packages/aux-files/linux-libre/5.5-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.6-x86_64.conf >> similarity index 100% >> rename from gnu/packages/aux-files/linux-libre/5.5-x86_64.conf >> rename to gnu/packages/aux-files/linux-libre/5.6-x86_64.conf > > This does not seem right. Surely there are _some_ configuration changes > in 5.6? Hence the "rough" patch. I honestly don't feel solid on all the configuration changes that need to happen, so haven't been particularly thorough on auditing those. Running through "make oldconfig" prompted me with many options about things I didn't really have a good grasp of, so the 5.5 changes at essentially just the 5.4*.conf copied to 5.5*.conf, and applying the copying the resulting .config from building the kernel into git... I could do the same for 5.6 again blindly taking the new defaults... or if someone could help with auditing the config updates, that would be great! FWIW, also boot-tested linux-libre-arm64-generic with 5.6 as well. live well, vagrant
Vagrant Cascadian <vagrant@debian.org> skribis: > On 2020-03-31, Marius Bakke wrote: >> Vagrant Cascadian <vagrant@debian.org> writes: >> >>> On 2020-03-30, Vagrant Cascadian wrote: >>>> And the second patch, switching to 5.5... >>> >>> And a third, rougher, less well tested patch switching to 5.6... which >>> could obviously be squashed into the previous patches and maybe skip 5.5 >>> altogether. >> >> 5.5 is not an LTS kernel, so going straight to 5.6 sounds like the >> right thing to do. However... >> >>> diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm.conf b/gnu/packages/aux-files/linux-libre/5.6-arm.conf >>> similarity index 100% >>> rename from gnu/packages/aux-files/linux-libre/5.5-arm.conf >>> rename to gnu/packages/aux-files/linux-libre/5.6-arm.conf >>> diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm64.conf b/gnu/packages/aux-files/linux-libre/5.6-arm64.conf >>> similarity index 100% >>> rename from gnu/packages/aux-files/linux-libre/5.5-arm64.conf >>> rename to gnu/packages/aux-files/linux-libre/5.6-arm64.conf >>> diff --git a/gnu/packages/aux-files/linux-libre/5.5-i686.conf b/gnu/packages/aux-files/linux-libre/5.6-i686.conf >>> similarity index 100% >>> rename from gnu/packages/aux-files/linux-libre/5.5-i686.conf >>> rename to gnu/packages/aux-files/linux-libre/5.6-i686.conf >>> diff --git a/gnu/packages/aux-files/linux-libre/5.5-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.6-x86_64.conf >>> similarity index 100% >>> rename from gnu/packages/aux-files/linux-libre/5.5-x86_64.conf >>> rename to gnu/packages/aux-files/linux-libre/5.6-x86_64.conf >> >> This does not seem right. Surely there are _some_ configuration changes >> in 5.6? > > Hence the "rough" patch. > > I honestly don't feel solid on all the configuration changes that need > to happen, so haven't been particularly thorough on auditing those. > > Running through "make oldconfig" prompted me with many options about > things I didn't really have a good grasp of, so the 5.5 changes at > essentially just the 5.4*.conf copied to 5.5*.conf, and applying the > copying the resulting .config from building the kernel into git... > > I could do the same for 5.6 again blindly taking the new defaults... or > if someone could help with auditing the config updates, that would be > great! > > > FWIW, also boot-tested linux-libre-arm64-generic with 5.6 as well. > > > live well, > vagrant From a quick test I made, support for the Wireguard VPN or the exfat file system in 5.6 is not activated by default when using 'make oldconfig' or 'make olddefconfig'. I think it would be nice to set them to 'module'.
On 2020-03-31, Vagrant Cascadian wrote: > On 2020-03-31, Marius Bakke wrote: >> Vagrant Cascadian <vagrant@debian.org> writes: >> >>> On 2020-03-30, Vagrant Cascadian wrote: >>>> And the second patch, switching to 5.5... >>> >>> And a third, rougher, less well tested patch switching to 5.6... which >>> could obviously be squashed into the previous patches and maybe skip 5.5 >>> altogether. >> >> 5.5 is not an LTS kernel, so going straight to 5.6 sounds like the >> right thing to do. However... >> >>> diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm.conf b/gnu/packages/aux-files/linux-libre/5.6-arm.conf >>> similarity index 100% >>> rename from gnu/packages/aux-files/linux-libre/5.5-arm.conf >>> rename to gnu/packages/aux-files/linux-libre/5.6-arm.conf ... >> >> This does not seem right. Surely there are _some_ configuration changes >> in 5.6? > > Hence the "rough" patch. > > I honestly don't feel solid on all the configuration changes that need > to happen, so haven't been particularly thorough on auditing those. > > Running through "make oldconfig" prompted me with many options about > things I didn't really have a good grasp of, so the 5.5 changes at > essentially just the 5.4*.conf copied to 5.5*.conf, and applying the > copying the resulting .config from building the kernel into git... > > I could do the same for 5.6 again blindly taking the new defaults... or > if someone could help with auditing the config updates, that would be > great! I pushed linux-libre 5.6 to master *without* setting it as the default linux-libre version; only added linux-libre-arm64-generic-5.6 and linux-libre-arm-generic-5.6 based on it. Attached are the remaining patches to switch it to the default. I still haven't thoroughly audited the config changes; this simply copies 5.4-*.conf to 5.6-*.conf in the first patch, and in the second patch updates them to 5.6 produced by building the package. By splitting it into two patches, this allows diffing from the old 5.4 configs, but should maybe be squashed if this gets pushed to master. Thanks for your review! live well, vagrant
From 029c3aa58db3e4ec7b54502c297d573361726fbc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <vagrant@debian.org> Date: Mon, 30 Mar 2020 21:09:28 +0000 Subject: [PATCH] gnu: linux-libre: Update to 5.6. --- Makefile.am | 8 ++-- .../{5.5-arm.conf => 5.6-arm.conf} | 0 .../{5.5-arm64.conf => 5.6-arm64.conf} | 0 .../{5.5-i686.conf => 5.6-i686.conf} | 0 .../{5.5-x86_64.conf => 5.6-x86_64.conf} | 0 gnu/packages/linux.scm | 42 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) rename gnu/packages/aux-files/linux-libre/{5.5-arm.conf => 5.6-arm.conf} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-arm64.conf => 5.6-arm64.conf} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-i686.conf => 5.6-i686.conf} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-x86_64.conf => 5.6-x86_64.conf} (100%) diff --git a/Makefile.am b/Makefile.am index 5b1fff3110..b8515c813a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -321,10 +321,10 @@ dist_noinst_DATA = \ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ - gnu/packages/aux-files/linux-libre/5.5-arm.conf \ - gnu/packages/aux-files/linux-libre/5.5-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.5-i686.conf \ - gnu/packages/aux-files/linux-libre/5.5-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.6-arm.conf \ + gnu/packages/aux-files/linux-libre/5.6-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.6-i686.conf \ + gnu/packages/aux-files/linux-libre/5.6-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.4-arm.conf \ gnu/packages/aux-files/linux-libre/5.4-arm64.conf \ gnu/packages/aux-files/linux-libre/5.4-i686.conf \ diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm.conf b/gnu/packages/aux-files/linux-libre/5.6-arm.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-arm.conf rename to gnu/packages/aux-files/linux-libre/5.6-arm.conf diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm64.conf b/gnu/packages/aux-files/linux-libre/5.6-arm64.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-arm64.conf rename to gnu/packages/aux-files/linux-libre/5.6-arm64.conf diff --git a/gnu/packages/aux-files/linux-libre/5.5-i686.conf b/gnu/packages/aux-files/linux-libre/5.6-i686.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-i686.conf rename to gnu/packages/aux-files/linux-libre/5.6-i686.conf diff --git a/gnu/packages/aux-files/linux-libre/5.5-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.6-x86_64.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-x86_64.conf rename to gnu/packages/aux-files/linux-libre/5.6-x86_64.conf diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8adbfe7b0b..4669957aa6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -192,11 +192,11 @@ defconfig. Return the appropriate make target if applicable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) -(define deblob-scripts-5.5 +(define deblob-scripts-5.6 (linux-libre-deblob-scripts - "5.5.13" - (base32 "1vj3rnrbkhj86lkabhrcm8qiqcz1lqi0lk54ysmg3lanf2vqgvab") - (base32 "1r87n60a1ksajqvkra55w4fa2iwsbhys3id8z2j179429pm0ybwn"))) + "5.6" + (base32 "09hxrr4xzllq5lmipfb6if30318lksrk9py1axc36m9ynql4w0rc") + (base32 "09qz5d31g5zwicsnncjnjij193hk0g6kg0ss9jyzh6lp3wilcm71"))) (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -368,13 +368,13 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.5-version "5.5.13") -(define-public linux-libre-5.5-pristine-source - (let ((version linux-libre-5.5-version) - (hash (base32 "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3cfqz"))) +(define-public linux-libre-5.6-version "5.6") +(define-public linux-libre-5.6-pristine-source + (let ((version linux-libre-5.6-version) + (hash (base32 "08mnzic407d3wjg3vyccxwqx02sjzhlapfpi1vm0hf56595b0hp3"))) (make-linux-libre-source version (%upstream-linux-source version hash) - deblob-scripts-5.5))) + deblob-scripts-5.6))) (define-public linux-libre-5.4-version "5.4.28") (define-public linux-libre-5.4-pristine-source @@ -444,8 +444,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) -(define-public linux-libre-5.5-source - (source-with-patches linux-libre-5.5-pristine-source +(define-public linux-libre-5.6-source + (source-with-patches linux-libre-5.6-pristine-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch ;; Pinebook Pro patch from linux-next, @@ -552,9 +552,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) -(define-public linux-libre-headers-5.5 - (make-linux-libre-headers* linux-libre-5.5-version - linux-libre-5.5-source)) +(define-public linux-libre-headers-5.6 + (make-linux-libre-headers* linux-libre-5.6-version + linux-libre-5.6-source)) (define-public linux-libre-headers-5.4 (make-linux-libre-headers* linux-libre-5.4-version @@ -820,16 +820,16 @@ It has been modified to remove all non-free binary blobs.") ;;; Generic kernel packages. ;;; -(define-public linux-libre-5.5 - (make-linux-libre* linux-libre-5.5-version - linux-libre-5.5-source +(define-public linux-libre-5.6 + (make-linux-libre* linux-libre-5.6-version + linux-libre-5.6-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-version linux-libre-5.5-version) -(define-public linux-libre-pristine-source linux-libre-5.5-pristine-source) -(define-public linux-libre-source linux-libre-5.5-source) -(define-public linux-libre linux-libre-5.5) +(define-public linux-libre-version linux-libre-5.6-version) +(define-public linux-libre-pristine-source linux-libre-5.6-pristine-source) +(define-public linux-libre-source linux-libre-5.6-source) +(define-public linux-libre linux-libre-5.6) (define-public linux-libre-5.4 (make-linux-libre* linux-libre-5.4-version -- 2.20.1
On 2020-03-30, Vagrant Cascadian wrote: > And the second patch, switching to 5.5... And a third, rougher, less well tested patch switching to 5.6... which could obviously be squashed into the previous patches and maybe skip 5.5 altogether. live well, vagrant