From be7eebe26dbbea10bf40e4cf54250c79ed581952 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 8 Jul 2019 01:44:09 -0400 Subject: gnu: linux-libre: Update to 5.2. * gnu/packages/linux.scm (%linux-libre-version): Update to 5.2. (%linux-libre-hash): Update hash. * linux-libre-5.1: Rename to ... * linux-libre-5.2: ... this. Use %linux-libre-5.2-patches. * linux-libre: Switch to linux-libre-5.2. * linux-libre-arm-veyron, linux-libre-arm-generic, linux-libre-arm-omap2plus: Use %linux-libre-5.2-patches. * linux-libre-headers-5.1: Rename to ... * linux-libre-headers-5.2: ... this. * %linux-libre-5.1-patches: Rename to ... * %linux-libre-5.2-patches: ... this. * gnu/packages/aux-files/linux-libre/5.1-arm-veyron.conf, gnu/packages/aux-files/linux-libre/5.1-arm.conf, gnu/packages/aux-files/linux-libre/5.1-arm64.conf, gnu/packages/aux-files/linux-libre/5.1-i686.conf, gnu/packages/aux-files/linux-libre/5.1-x86_64.conf: Delete files. * gnu/packages/aux-files/linux-libre/5.2-arm-veyron.conf, gnu/packages/aux-files/linux-libre/5.2-arm.conf, gnu/packages/aux-files/linux-libre/5.2-arm64.conf, gnu/packages/aux-files/linux-libre/5.2-i686.conf, gnu/packages/aux-files/linux-libre/5.2-x86_64.conf: New files. * Makefile.am (AUX_FILES): Update accordingly. --- gnu/packages/linux.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e7c97c0243..2b22c344ea 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -430,21 +430,21 @@ (define* (make-linux-libre version hash supported-systems It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.1.17") -(define %linux-libre-hash "049mij4z1iilrggw6plfdpcj1lnc1vqz5z445ix9677cq1fmiwlh") +(define %linux-libre-version "5.2") +(define %linux-libre-hash "1s9rcjwy2vmfpin5kxv015ys7lvv84y1pxl1y5aiw0y1mif0mgxb") -(define %linux-libre-5.1-patches +(define %linux-libre-5.2-patches (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch)) -(define-public linux-libre-5.1 +(define-public linux-libre-5.2 (make-linux-libre %linux-libre-version %linux-libre-hash '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") - #:patches %linux-libre-5.1-patches + #:patches %linux-libre-5.2-patches #:configuration-file kernel-config)) -(define-public linux-libre-headers-5.1 +(define-public linux-libre-headers-5.2 (make-linux-libre-headers %linux-libre-version %linux-libre-hash)) @@ -501,7 +501,7 @@ (define-public linux-libre-arm-veyron (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") - #:patches %linux-libre-5.1-patches + #:patches %linux-libre-5.2-patches #:configuration-file kernel-config-veyron #:extra-version "arm-veyron")) @@ -510,13 +510,13 @@ (define-public linux-libre-headers-4.14.67 "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")) (define-public linux-libre-headers linux-libre-headers-4.14.67) -(define-public linux-libre linux-libre-5.1) +(define-public linux-libre linux-libre-5.2) (define-public linux-libre-arm-generic (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") - #:patches %linux-libre-5.1-patches + #:patches %linux-libre-5.2-patches #:defconfig "multi_v7_defconfig" #:extra-version "arm-generic")) @@ -539,7 +539,7 @@ (define-public linux-libre-arm-omap2plus (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") - #:patches %linux-libre-5.1-patches + #:patches %linux-libre-5.2-patches #:defconfig "omap2plus_defconfig" #:extra-version "arm-omap2plus")) -- cgit v1.2.3 From 2f3c0fb39d8bc6fc9a629b79947691da48ca42e9 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 14 Jul 2019 12:47:06 +0100 Subject: gnu: linux-libre: Fix build on aarch64. * gnu/packages/linux.scm (make-linux-libre)[arguments]: Remove 'work-around-gcc-7-include-path-issue phase. --- gnu/packages/linux.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2b22c344ea..4c31f7d750 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2019 Tim Gesthuizen ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović +;;; Copyright © 2019 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -355,11 +356,6 @@ (define* (make-linux-libre version hash supported-systems (substitute* (find-files "." "^Makefile(\\.include)?$") (("/bin/pwd") "pwd")) #t)) - (add-before 'configure 'work-around-gcc-7-include-path-issue - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) ;; Avoid introducing timestamps -- cgit v1.2.3 From ec92941a8295aa26b9fc23812ac7e44ecbaec5c3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 15 Jul 2019 15:25:19 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.59. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.59. (%linux-libre-4.19-hash): 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 4c31f7d750..bb45175f83 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -444,8 +444,8 @@ (define-public linux-libre-headers-5.2 (make-linux-libre-headers %linux-libre-version %linux-libre-hash)) -(define %linux-libre-4.19-version "4.19.58") -(define %linux-libre-4.19-hash "0i2mh0zk1h1niba1bpd49bn938sdn3qrwzkqpqzimxnj31xcjhyz") +(define %linux-libre-4.19-version "4.19.59") +(define %linux-libre-4.19-hash "1c9qfw1mnz68ki48kg1brmv47wmsdvq41ip6202rlnmwgncj5yrw") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From 5b524f448c958c417952d43db3ccc27b0577ff37 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 15 Jul 2019 15:26:40 -0400 Subject: gnu: linux-libre: Update to 5.2.1. * gnu/packages/linux.scm (%linux-libre-version): Update to 5.2.1. (%linux-libre-hash): 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 bb45175f83..30192f195d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -426,8 +426,8 @@ (define* (make-linux-libre version hash supported-systems It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.2") -(define %linux-libre-hash "1s9rcjwy2vmfpin5kxv015ys7lvv84y1pxl1y5aiw0y1mif0mgxb") +(define %linux-libre-version "5.2.1") +(define %linux-libre-hash "1qj3zsjynz45p97n6sngdbh4xfd1jks3hbn85nmhzds6sxgg4c54") (define %linux-libre-5.2-patches (list %boot-logo-patch -- cgit v1.2.3 From 6f850a19a76a993fcf25f7da362433d8b04bf848 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Jul 2019 15:09:45 +0200 Subject: gnu: multipath-tools: Remove Ceph input. Ceph adds a massive dependency for a little-used feature. It was mainly added because the build-system previously could not cope with librados being missing. * gnu/packages/linux.scm (multipath-tools)[inputs]: Remove CEPH:LIB. --- gnu/packages/linux.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 30192f195d..3785261115 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -105,7 +105,6 @@ (define-module (gnu packages linux) #:use-module (gnu packages samba) #:use-module (gnu packages serialization) #:use-module (gnu packages slang) - #:use-module (gnu packages storage) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) @@ -3302,8 +3301,7 @@ (define-public multipath-tools ("pkg-config" ,pkg-config) ("valgrind" ,valgrind))) (inputs - `(("ceph:lib" ,ceph "lib") - ("json-c" ,json-c) + `(("json-c" ,json-c) ("libaio" ,libaio) ("liburcu" ,liburcu) ("lvm2" ,lvm2) -- cgit v1.2.3 From dcc773e56049eb64efc61961cddb4fdba0d7a582 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Jul 2019 15:10:58 +0200 Subject: gnu: multipath-tools: Update to 0.8.2. * gnu/packages/linux.scm (multipath-tools): Update to 0.8.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 3785261115..8ffa18a312 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3249,7 +3249,7 @@ (define-public mdadm-static (define-public multipath-tools (package (name "multipath-tools") - (version "0.7.9") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "https://git.opensvc.com/?p=multipath-tools/" @@ -3257,7 +3257,7 @@ (define-public multipath-tools (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jhi6bhl4ih75rfmyyjxd35ghgch5ls1gw40cjxwy9d6bd41z6q1")) + "0kb4mhzwyygdbikikmby6hj39pb3nrzv05v526c75wnycwnpxg31")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3