From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:36588) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ4Ui-0000vl-A2 for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJ4Ug-00055e-NE for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJ4Ug-000557-Ho for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jJ4Ug-0004wV-9m for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:02 -0400 Subject: [bug#40190] Linux-Libre 5.6 Resent-Message-ID: From: Vagrant Cascadian In-Reply-To: <87h7y5g30m.fsf@ponder> References: <87k13gqhrw.fsf@ponder> <87sgi0le3g.fsf@ponder> <87mu87btng.fsf@yucca> <87mu7xg34t.fsf@ponder> <87h7y5g30m.fsf@ponder> Date: Mon, 30 Mar 2020 17:10:45 -0700 Message-ID: <874ku5fkoq.fsf@ponder> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40190@debbugs.gnu.org Cc: Mark H Weaver --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-linux-libre-Update-to-5.6.patch Content-Transfer-Encoding: quoted-printable From=20029c3aa58db3e4ec7b54502c297d573361726fbc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 30 Mar 2020 21:09:28 +0000 Subject: [PATCH] gnu: linux-libre: Update to 5.6. =2D-- Makefile.am | 8 ++-- .../{5.5-arm.conf =3D> 5.6-arm.conf} | 0 .../{5.5-arm64.conf =3D> 5.6-arm64.conf} | 0 .../{5.5-i686.conf =3D> 5.6-i686.conf} | 0 .../{5.5-x86_64.conf =3D> 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 =3D> 5.6-arm.conf}= (100%) rename gnu/packages/aux-files/linux-libre/{5.5-arm64.conf =3D> 5.6-arm64.c= onf} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-i686.conf =3D> 5.6-i686.con= f} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-x86_64.conf =3D> 5.6-x86_64= .conf} (100%) diff --git a/Makefile.am b/Makefile.am index 5b1fff3110..b8515c813a 100644 =2D-- a/Makefile.am +++ b/Makefile.am @@ -321,10 +321,10 @@ dist_noinst_DATA =3D \ AUX_FILES =3D \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ =2D gnu/packages/aux-files/linux-libre/5.5-arm.conf \ =2D gnu/packages/aux-files/linux-libre/5.5-arm64.conf \ =2D gnu/packages/aux-files/linux-libre/5.5-i686.conf \ =2D 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/packag= es/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/package= s/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/packa= ges/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 =2D-- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -192,11 +192,11 @@ defconfig. Return the appropriate make target if app= licable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) =20 =2D(define deblob-scripts-5.5 +(define deblob-scripts-5.6 (linux-libre-deblob-scripts =2D "5.5.13" =2D (base32 "1vj3rnrbkhj86lkabhrcm8qiqcz1lqi0lk54ysmg3lanf2vqgvab") =2D (base32 "1r87n60a1ksajqvkra55w4fa2iwsbhys3id8z2j179429pm0ybwn"))) + "5.6" + (base32 "09hxrr4xzllq5lmipfb6if30318lksrk9py1axc36m9ynql4w0rc") + (base32 "09qz5d31g5zwicsnncjnjij193hk0g6kg0ss9jyzh6lp3wilcm71"))) =20 (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))) =20 =2D(define-public linux-libre-5.5-version "5.5.13") =2D(define-public linux-libre-5.5-pristine-source =2D (let ((version linux-libre-5.5-version) =2D (hash (base32 "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3c= fqz"))) +(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 "08mnzic407d3wjg3vyccxwqx02sjzhlapfpi1vm0hf56595b0hp= 3"))) (make-linux-libre-source version (%upstream-linux-source version hash) =2D deblob-scripts-5.5))) + deblob-scripts-5.6))) =20 (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 gi= ven DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) =20 =2D(define-public linux-libre-5.5-source =2D (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 gi= ven DEBLOB-SCRIPTS." (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) =20 =2D(define-public linux-libre-headers-5.5 =2D (make-linux-libre-headers* linux-libre-5.5-version =2D 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)) =20 (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 bl= obs.") ;;; Generic kernel packages. ;;; =20 =2D(define-public linux-libre-5.5 =2D (make-linux-libre* linux-libre-5.5-version =2D 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" "riscv6= 4-linux") #:configuration-file kernel-config)) =20 =2D(define-public linux-libre-version linux-libre-5.5-version) =2D(define-public linux-libre-pristine-source linux-libre-5.5-pristine-sour= ce) =2D(define-public linux-libre-source linux-libre-5.5-source) =2D(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) =20 (define-public linux-libre-5.4 (make-linux-libre* linux-libre-5.4-version =2D-=20 2.20.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXoKKhgAKCRDcUY/If5cW qgvqAP9fbMqeWL+BGEJe9nTV1kieJi+sZEfk4xkS5owXPKnA8QD/XUDY9hFKNQDf 0KRXV7Sk5TBeY1Qh7/6KtIzAaRGV4Qo= =k/m8 -----END PGP SIGNATURE----- --==-=-=--