From 9e34a5f3b2d37cc8fb9f16620747df41488665be Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Sep 2019 20:52:48 +0200 Subject: gnu: linux-libre: Add version 5.3.1. * gnu/packages/linux.scm (linux-libre-5.3-version) (linux-libre-5.3-pristine-source, linux-libre-5.3-source) (linux-libre-headers-5.3, linux-libre-5.3): New public variables. * gnu/packages/aux-files/linux-libre/5.3-arm.conf, gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf, gnu/packages/aux-files/linux-libre/5.3-arm64.conf, gnu/packages/aux-files/linux-libre/5.3-i686.conf, gnu/packages/aux-files/linux-libre/5.3-x86_64.conf: New files. * Makefile.am (AUX_FILES): Add them. --- gnu/packages/linux.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fed8d8b96d..e333135a0f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -181,6 +181,12 @@ defconfig. Return the appropriate make target if applicable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) +(define deblob-scripts-5.3 + (linux-libre-deblob-scripts + "5.3.1" + (base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4") + (base32 "1av9ykv714cnl0clls8rhwa8rwflz6ivg17gharj1x650qp6vnw3"))) + (define deblob-scripts-5.2 (linux-libre-deblob-scripts "5.2.17" @@ -351,6 +357,14 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) +(define-public linux-libre-5.3-version "5.3.1") +(define-public linux-libre-5.3-pristine-source + (let ((version linux-libre-5.3-version) + (hash (base32 "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-5.3))) + (define-public linux-libre-5.2-version "5.2.17") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) @@ -419,6 +433,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) +(define-public linux-libre-5.3-source + (source-with-patches linux-libre-5.3-pristine-source + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch))) + (define-public linux-libre-5.2-source (source-with-patches linux-libre-5.2-pristine-source (list %boot-logo-patch @@ -511,6 +530,10 @@ 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.3 + (make-linux-libre-headers* linux-libre-5.3-version + linux-libre-5.3-source)) + (define-public linux-libre-headers-5.2 (make-linux-libre-headers* linux-libre-5.2-version linux-libre-5.2-source)) @@ -756,6 +779,12 @@ It has been modified to remove all non-free binary blobs.") ;;; Generic kernel packages. ;;; +(define-public linux-libre-5.3 + (make-linux-libre* linux-libre-5.3-version + linux-libre-5.3-source + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") + #:configuration-file kernel-config)) + (define-public linux-libre-5.2 (make-linux-libre* linux-libre-5.2-version linux-libre-5.2-source -- cgit 1.4.1 From e8ded3ee6af0324fbca067511768be1c3bd1ad66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 2 Oct 2019 12:07:46 +0200 Subject: gnu: linux-libre-headers@5.3: Install. Upstream has separated building and installing the UAPI headers, and now requires rsync for the latter. Follow-up to commit 9e34a5f3b2d37cc8fb9f16620747df41488665be. * gnuk/packages/linux.scm (make-linux-libre-headers*)[native-inputs]: Add rsync for version 5.3 and higher. --- gnu/packages/linux.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e333135a0f..679d0b00c7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -116,6 +116,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages groff) + #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) #:use-module (gnu packages swig) #:use-module (guix build-system cmake) @@ -482,6 +483,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ,@(if (version>=? version "4.16") `(("flex" ,flex) ("bison" ,bison)) + '()) + ,@(if (version>=? version "5.3") + `(("rsync" ,rsync)) '()))) (arguments `(#:modules ((guix build gnu-build-system) -- cgit 1.4.1 From 9a68b89e8ab47b6e3297dc82bde576f4c70a6a2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 3 Oct 2019 15:59:47 +0200 Subject: gnu: linux-libre: Update to 5.3. * gnu/packages/linux.scm (linux-libre-version) (linux-libre-pristine-source, linux-libre-source, linux-libre): Assign -5.3 values. --- gnu/packages/linux.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 679d0b00c7..71991c8eec 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -789,17 +789,17 @@ It has been modified to remove all non-free binary blobs.") '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") #:configuration-file kernel-config)) +(define-public linux-libre-version linux-libre-5.3-version) +(define-public linux-libre-pristine-source linux-libre-5.3-pristine-source) +(define-public linux-libre-source linux-libre-5.3-source) +(define-public linux-libre linux-libre-5.3) + (define-public linux-libre-5.2 (make-linux-libre* linux-libre-5.2-version linux-libre-5.2-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-version linux-libre-5.2-version) -(define-public linux-libre-pristine-source linux-libre-5.2-pristine-source) -(define-public linux-libre-source linux-libre-5.2-source) -(define-public linux-libre linux-libre-5.2) - (define-public linux-libre-4.19 (make-linux-libre* linux-libre-4.19-version linux-libre-4.19-source -- cgit 1.4.1 From dd32676b067caeeeed46a582435852d97da6ad88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Oct 2019 01:06:48 +0200 Subject: gnu: linux-libre@5.3: Update to 5.3.2. * gnu/packages/linux.scm (linux-libre-5.3-version) (linux-libre-5.3-pristine-source): Update to 5.3.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 71991c8eec..ac5674b583 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.3-version "5.3.1") +(define-public linux-libre-5.3-version "5.3.2") (define-public linux-libre-5.3-pristine-source (let ((version linux-libre-5.3-version) - (hash (base32 "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q"))) + (hash (base32 "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.3))) -- cgit 1.4.1 From 1bedc74e7f98940d728a28ccca75779fed60b72d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Oct 2019 01:10:11 +0200 Subject: gnu: linux-libre@5.2: Update to 5.2.18. * gnu/packages/linux.scm (linux-libre-5.2-version) (linux-libre-5.2-pristine-source): Update to 5.2.18. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ac5674b583..7607609891 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-5.2-version "5.2.17") +(define-public linux-libre-5.2-version "5.2.18") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv"))) + (hash (base32 "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -- cgit 1.4.1 From 57ec0551c8a360c592a8ecdd3ad30d315353a3d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Oct 2019 01:10:42 +0200 Subject: gnu: linux-libre@4.19: Update to 4.19.76. * gnu/packages/linux.scm (linux-libre-4.19-version) (linux-libre-4.19-pristine-source): Update to 4.19.76. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7607609891..21cd4a205f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -374,10 +374,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.75") +(define-public linux-libre-4.19-version "4.19.76") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx"))) + (hash (base32 "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1