From 952820c53964a3ee6fdca94e15771eb1097c87be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Dec 2019 16:29:49 -0500 Subject: gnu: linux-libre: Update to 5.4.5. * gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf, gnu/packages/aux-files/linux-libre/5.3-arm.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: Delete files. * gnu/packages/aux-files/linux-libre/5.4-arm-veyron.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, gnu/packages/aux-files/linux-libre/5.4-x86_64.conf: New files. * Makefile.am (AUX_FILES): Update accordingly. * gnu/packages/patches/linux-libre-active-entropy.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/linux.scm (deblob-scripts-5.3, 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): Remove variables. (deblob-scripts-5.4, linux-libre-5.4-version) (linux-libre-5.4-pristine-source, linux-libre-5.4-source) (linux-libre-headers-5.4, linux-libre-5.4): New variables. (linux-libre-version, linux-libre-pristine-source) (linux-libre-source, linux-libre): Point to linux-libre-5.4*. --- gnu/packages/linux.scm | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5c5f930485..bea10b1bdd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -186,11 +186,11 @@ defconfig. Return the appropriate make target if applicable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) -(define deblob-scripts-5.3 +(define deblob-scripts-5.4 (linux-libre-deblob-scripts - "5.3.17" - (base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4") - (base32 "1xk3gzgnl9m29avka32zkggl36sdxyvps40hr12hjy42l1ysfshm"))) + "5.4.4" + (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") + (base32 "09hy3jqb8lny861pxjbjvzg90imi8p7z10j14xp0rclxmyb81rk3"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -356,13 +356,13 @@ 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.18") -(define-public linux-libre-5.3-pristine-source - (let ((version linux-libre-5.3-version) - (hash (base32 "133342nv9ddjad2rizmcbilg9rhg339sfqr9l77j4cgkqhblkw90"))) +(define-public linux-libre-5.4-version "5.4.5") +(define-public linux-libre-5.4-pristine-source + (let ((version linux-libre-5.4-version) + (hash (base32 "1h1ynb51gd4kiakqlkcc7vny45j2snbg4j985qf171mszckrz3jn"))) (make-linux-libre-source version (%upstream-linux-source version hash) - deblob-scripts-5.3))) + deblob-scripts-5.4))) (define-public linux-libre-4.19-version "4.19.90") (define-public linux-libre-4.19-pristine-source @@ -424,10 +424,9 @@ 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 (search-patch "linux-libre-active-entropy.patch") - %boot-logo-patch +(define-public linux-libre-5.4-source + (source-with-patches linux-libre-5.4-pristine-source + (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-4.19-source @@ -520,9 +519,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.3 - (make-linux-libre-headers* linux-libre-5.3-version - linux-libre-5.3-source)) +(define-public linux-libre-headers-5.4 + (make-linux-libre-headers* linux-libre-5.4-version + linux-libre-5.4-source)) (define-public linux-libre-headers-4.19 (make-linux-libre-headers* linux-libre-4.19-version @@ -777,16 +776,16 @@ 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 +(define-public linux-libre-5.4 + (make-linux-libre* linux-libre-5.4-version + linux-libre-5.4-source '("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-version linux-libre-5.4-version) +(define-public linux-libre-pristine-source linux-libre-5.4-pristine-source) +(define-public linux-libre-source linux-libre-5.4-source) +(define-public linux-libre linux-libre-5.4) (define-public linux-libre-4.19 (make-linux-libre* linux-libre-4.19-version -- cgit 1.4.1 From a21b88f10cabd94636d72284c5b435ba814f125e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 19 Dec 2019 15:28:56 +0100 Subject: gnu: wireless-tools: Fix cross-compilation. * gnu/packages/linux.scm (wireless-tools)[arguments]: Replace 'configure phase to substitute CC, AR and RANLIB Makefile variables to suitable values when cross-compiling. --- gnu/packages/linux.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bea10b1bdd..8a02c353b1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2831,8 +2831,20 @@ mapper. Kernel components are part of Linux-libre.") (string-append "INSTALL_MAN=" %output "/share/man") (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") "BUILD_STATIC=") - #:phases (modify-phases %standard-phases - (delete 'configure)) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key target #:allow-other-keys) + (when ,(%current-target-system) + ;; Cross-compilation: use the cross tools. + (substitute* (find-files "." "Makefile") + (("CC = .*$") + (string-append "CC = " target "-gcc\n")) + (("AR = .*$") + (string-append "AR = " target "-ar\n")) + (("RANLIB = .*$") + (string-append "RANLIB = " target "-ranlib\n")))) + #t))) #:tests? #f)) (synopsis "Tools for manipulating Linux Wireless Extensions") (description "Wireless Tools are used to manipulate the now-deprecated -- cgit 1.4.1 From 6f45c6e05ce0beeb0288c0380470764a9ae21cd6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Dec 2019 07:15:32 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.207. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.207. (linux-libre-4.4-pristine-source): Update hash. --- 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 8a02c353b1..7acef209e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -388,10 +388,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.206") +(define-public linux-libre-4.4-version "4.4.207") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "14ylg9cm7z12mvkzg8z92gsw0libw9xz392ayzw0d9cgw1py39ax"))) + (hash (base32 "024flajnl3l4yk8sgqdrfrl21js4vsjcv4ivmjblj4l9fl3hdjb6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From cc9e607dd0af3ceee96e5e5f1aa8d54f9d0faca9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Dec 2019 07:16:37 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.207. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.207. (linux-libre-4.9-pristine-source): Update hash. --- 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 7acef209e1..c73ca353a5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -380,10 +380,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.206") +(define-public linux-libre-4.9-version "4.9.207") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1mnabj0d5ra40hijwynnzxnh5w1qnvkvj2l3ydsdhkdwm6cpiwhx"))) + (hash (base32 "090181vij95py22jhx7baaxabb78w0j5hsfsnzp6bv2vgdz671na"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From ca99c118040cf92e40689ea64665d87f868d77a9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Dec 2019 07:17:13 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.160. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.160. (linux-libre-4.14-pristine-source): Update hash. --- 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 c73ca353a5..66a851bd23 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,10 +372,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.159") +(define-public linux-libre-4.14-version "4.14.160") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1wi6m3w40z0v9krb12g9q09s9y471r51rhcv3qa81lc53cx2vm78"))) + (hash (base32 "0b59xyr8if0qcbnwqa88y275g9rzhjbbp8589i8xxpmws6x2c0y6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 3dc100db9c8513c767f14237d6cf4f7ebeb4d843 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Dec 2019 07:18:04 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.91. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.91. (linux-libre-4.19-pristine-source): Update hash. --- 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 66a851bd23..a9f38c9fad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -364,10 +364,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.90") +(define-public linux-libre-4.19-version "4.19.91") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1zgpbim9019aymvgh0fr5g2r9j2xspw14amlnk09w5mgdl56rn19"))) + (hash (base32 "0irl5jlh5rrdfz5g28x4ifbillvspwd8fy4wi3qhmv9dw7gc60zl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From c109d3268bc0fc732141b1e60368c00e41ae4638 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Dec 2019 07:18:54 -0500 Subject: gnu: linux-libre: Update to 5.4.6. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.6. (linux-libre-5.4-pristine-source): Update hash. --- 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 a9f38c9fad..a7a80809d6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -356,10 +356,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.5") +(define-public linux-libre-5.4-version "5.4.6") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1h1ynb51gd4kiakqlkcc7vny45j2snbg4j985qf171mszckrz3jn"))) + (hash (base32 "1j4916izy2nrzq7g6m5m365r60hhhx9rqcanjvaxv5x3vsy639gx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From cd7e688596aa2dc9f48e0b5efb760fd0e889b406 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Dec 2019 22:43:29 +0100 Subject: gnu: cpupower: Fix library location. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (cpupower)[arguments]: Add a ‘libdir’ to #:make-flags. --- gnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a7a80809d6..c93ed8e387 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4519,6 +4519,7 @@ from that to the system kernel's @file{/dev/random} machinery.") #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) (string-append "LDFLAGS=-Wl,-rpath=" out "/lib") + "libdir=/lib" "docdir=/share/doc/cpupower" "confdir=$(docdir)/examples" ;; The Makefile recommends the following changes -- cgit 1.4.1 From aabe373b2f8ff072e5bbaf59dbfab81b1403552f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Dec 2019 16:51:51 +0100 Subject: gnu: btrfs-progs: Update to 5.4. * gnu/packages/linux.scm (btrfs-progs): Update to 5.4. --- 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 c93ed8e387..96df2172e6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3941,7 +3941,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.3.1") + (version "5.4") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -3949,7 +3949,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "0f6s1iwiqbncrvxp74k50s88x6zqf85sjxg04kyni82l1vk1m8xz")))) + "1ykhasv0jc3qi3xrm5841mzkmlbkjw6rm70gl4aww90jj6ak55qg")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit 1.4.1 From 8e690499f82f4cb0fe0ca4f0aee7837185c94f46 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jan 2020 01:45:12 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.161. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.161. (linux-libre-4.14-pristine-source): Update hash. --- 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 96df2172e6..c813fd8850 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,10 +372,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.160") +(define-public linux-libre-4.14-version "4.14.161") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0b59xyr8if0qcbnwqa88y275g9rzhjbbp8589i8xxpmws6x2c0y6"))) + (hash (base32 "1jc1izlvgymp9x61r4yz2xhplwmp6x8laxqj9wy33iz6a2gn48wx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From fed39c384dd04040a563904452251b18bcbf5d4d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jan 2020 01:46:16 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.92. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.92. (linux-libre-4.19-pristine-source): Update hash. --- 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 c813fd8850..9e51f87f33 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -364,10 +364,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.91") +(define-public linux-libre-4.19-version "4.19.92") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0irl5jlh5rrdfz5g28x4ifbillvspwd8fy4wi3qhmv9dw7gc60zl"))) + (hash (base32 "18l3k0hgyanh6axgmmaaff139vpw6lf3fcf9iglpqwgspgw7rhr9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 8220e8937203aa88b4307415c8eba04e7d7808bc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 1 Jan 2020 02:02:26 -0500 Subject: gnu: linux-libre: Update to 5.4.7. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.7. (linux-libre-5.4-pristine-source): Update hash. --- 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 9e51f87f33..cc3455b52b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -356,10 +356,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.6") +(define-public linux-libre-5.4-version "5.4.7") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1j4916izy2nrzq7g6m5m365r60hhhx9rqcanjvaxv5x3vsy639gx"))) + (hash (base32 "1jgwg5qb7lb30m5ywvpfagzrl6d0i524qpy3v99mina6j4fv5jdb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1