From d9804e5011a58341aafbf4fadd00947f3e5f436e Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 16 Nov 2016 20:08:46 +0100 Subject: gnu: util-linux: Add current system profile to fs search path. * gnu/packages/linux.scm (util-linux)[arguments]: Add "--enable-fs-paths-default=/run/current-system/profile/sbin" to configure-flags. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9518de478..c96155e7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -472,7 +472,7 @@ providing the system administrator with some help in common tasks.") "static")) ; >2 MiB of static .a libraries (arguments `(#:configure-flags (list "--disable-use-tty-group" - + "--enable-fs-paths-default=/run/current-system/profile/sbin" ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" -- cgit v1.3 From 68ea090b93132001d1fd1db44ffde7425cd1702c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Dec 2016 23:46:38 +0100 Subject: gnu: libcap: Update to 2.25. * gnu/packages/linux.scm (libcap): Update to 2.25. --- 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 c504a1260..3b8f5adcb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1087,7 +1087,7 @@ advanced aspects of IP configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.24") + (version "2.25") (source (origin (method url-fetch) (uri (string-append @@ -1095,7 +1095,7 @@ advanced aspects of IP configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "0rbc9qbqs5bp9am9s9g83wxj5k4ixps2agy9dxr1v1fwg27mdr6f")))) + "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.3 From c09dd486a2fffad6efc7d352cfea459876ba44bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 27 Dec 2016 22:24:06 +0100 Subject: gnu: util-linux: Update to 2.28.2. * gnu/packages/linux.scm (util-linux): Update to 2.28.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 3b8f5adcb..a040aeb76 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -448,7 +448,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.28.1") + (version "2.28.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -456,7 +456,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "03xnaw3c7pavxvvh1vnimcr44hlhhf25whawiyv8dxsflfj4xkiy")) + "1kgh16j3ywzf5gdz4vq6v3dyc5qsi377p11clj9xxgi0dwa3g7dq")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.3 From 440a3143f01083649dedddc97a0d6108bb3d2920 Mon Sep 17 00:00:00 2001 From: Carlos Sánchez de La Lama Date: Wed, 4 Jan 2017 23:50:37 +0100 Subject: gnu: linux-libre: Adjust for PowerPC. * gnu/packages/linux.scm (system->defconfig): New procedure. (linux-libre-headers)[arguments]: Use it in 'build' phase to determine the target name. * gnu/packages/cross-base.scm (cross-kernel-headers)[xlinux-headers] (arguments): Likewise. --- gnu/packages/cross-base.scm | 2 +- gnu/packages/linux.scm | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index e6553dcd3..da2efc364 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -315,7 +315,7 @@ GCC that does not target a libc; otherwise, target that libc." (setenv "ARCH" ,(system->linux-architecture target)) (format #t "`ARCH' set to `~a' (cross compiling)~%" (getenv "ARCH")) - (and (zero? (system* "make" "defconfig")) + (and (zero? (system* "make" ,(system->defconfig target))) (zero? (system* "make" "mrproper" "headers_check")))) ,phases)))) (native-inputs `(("cross-gcc" ,xgcc) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a040aeb76..a0d86bb40 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2016 Rene Saavedra +;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,13 @@ ((string-prefix? "aarch64" arch) "arm64") (else arch)))) +(define-public (system->defconfig system) + "Some systems (notably powerpc-linux) require a special target for kernel +defconfig. Return the appropiate make target if applicable, otherwise return +\"defconfig\"." + (cond ((string-prefix? "powerpc-" system) "pmac32_defconfig") + (else "defconfig"))) + (define (linux-libre-urls version) "Return a list of URLs for Linux-Libre VERSION." (list (string-append @@ -137,11 +145,13 @@ (lambda _ (let ((arch ,(system->linux-architecture (or (%current-target-system) - (%current-system))))) + (%current-system)))) + (defconfig ,(system->defconfig + (or (%current-target-system) + (%current-system))))) (setenv "ARCH" arch) (format #t "`ARCH' set to `~a'~%" (getenv "ARCH")) - - (and (zero? (system* "make" "defconfig")) + (and (zero? (system* "make" defconfig)) (zero? (system* "make" "mrproper" "headers_check")))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.3 From e77fe95097145268249302bd5c1f73236ae0f155 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Feb 2017 16:58:31 +0200 Subject: gnu: linux-libre-headers: Update to 4.4.47. * gnu/packages/linux.scm (linux-libre-headers): Update to 4.4.47. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e5615c0e5..e6ac5121f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016 Efraim Flashner +;;; Copyright © 2015, 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice ;;; Copyright © 2016 Alex Kost @@ -131,13 +131,13 @@ defconfig. Return the appropiate make target if applicable, otherwise return (define-public linux-libre-headers (package (name "linux-libre-headers") - (version "4.4.18") + (version "4.4.47") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "0k8k17in7dkjd9d8zg3i8l1ax466dba6bxw28flxizzyq8znljps")))) + "00zdq7swhvzbbnnhzizq6m34q5k4fycpcp215bmkbxh1ic76v7bs")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (arguments -- cgit v1.3 From 0172d5a12ec2efd57a8e05201ae83dc02a2b9d31 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 15 Feb 2017 22:06:13 -0500 Subject: gnu: util-linux: Update to 2.29.1. * gnu/packages/linux.scm (util-linux): Update to 2.29.1. --- 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 95e8a0a15..0460846c6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -469,7 +469,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.28.2") + (version "2.29.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -477,7 +477,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "1kgh16j3ywzf5gdz4vq6v3dyc5qsi377p11clj9xxgi0dwa3g7dq")) + "0kzmhb2swiqk402jp0y2jsx53l42d7z4xz3bzbn2zv1lp400dr0c")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.3 From 5f3070a500f22f32e606d30d0fa1c08a95704fda Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Feb 2017 10:56:15 +0100 Subject: gnu: alsa-lib: Update to 1.1.3. * gnu/packages/patches/alsa-lib-mips-atomic-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/linux.scm (alsa-lib): Update to 1.1.3. [source]: Remove patch. [home-page]: Use HTTPS. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 7 ++-- .../patches/alsa-lib-mips-atomic-fix.patch | 42 ---------------------- 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 gnu/packages/patches/alsa-lib-mips-atomic-fix.patch (limited to 'gnu/packages/linux.scm') diff --git a/gnu/local.mk b/gnu/local.mk index d0afedd6b..d7c7ed347 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -481,7 +481,6 @@ dist_patch_DATA = \ %D%/packages/patches/aegis-test-fixup-1.patch \ %D%/packages/patches/aegis-test-fixup-2.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ - %D%/packages/patches/alsa-lib-mips-atomic-fix.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/arb-ldconfig.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f9b8810b0..eadd18f78 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -865,7 +865,7 @@ intercept and print the system calls executed by the program.") (define-public alsa-lib (package (name "alsa-lib") - (version "1.0.27.1") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append @@ -873,10 +873,9 @@ intercept and print the system calls executed by the program.") version ".tar.bz2")) (sha256 (base32 - "0fx057746dj7rjdi0jnvx2m9b0y1lgdkh1hks87d8w32xyihf3k9")) - (patches (search-patches "alsa-lib-mips-atomic-fix.patch")))) + "174n2psp0328xcy2f1ayls67598bxli6q9cf00d2qnac3012aa3i")))) (build-system gnu-build-system) - (home-page "http://www.alsa-project.org/") + (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") (description "The Advanced Linux Sound Architecture (ALSA) provides audio and diff --git a/gnu/packages/patches/alsa-lib-mips-atomic-fix.patch b/gnu/packages/patches/alsa-lib-mips-atomic-fix.patch deleted file mode 100644 index 8c37bd3ac..000000000 --- a/gnu/packages/patches/alsa-lib-mips-atomic-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -Fix the declarations of inlined atomic ops for mips. - -This patch was copied from Debian. - ---- alsa-lib/include/iatomic.h.orig 2013-05-21 04:48:28.000000000 -0400 -+++ alsa-lib/include/iatomic.h 2013-10-29 13:01:37.055995968 -0400 -@@ -720,7 +720,7 @@ - * Atomically adds @i to @v. Note that the guaranteed useful range - * of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_add(int i, atomic_t * v) -+static __inline__ void atomic_add(int i, atomic_t * v) - { - unsigned long temp; - -@@ -744,7 +744,7 @@ - * Atomically subtracts @i from @v. Note that the guaranteed - * useful range of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_sub(int i, atomic_t * v) -+static __inline__ void atomic_sub(int i, atomic_t * v) - { - unsigned long temp; - -@@ -763,7 +763,7 @@ - /* - * Same as above, but return the result value - */ --extern __inline__ int atomic_add_return(int i, atomic_t * v) -+static __inline__ int atomic_add_return(int i, atomic_t * v) - { - unsigned long temp, result; - -@@ -784,7 +784,7 @@ - return result; - } - --extern __inline__ int atomic_sub_return(int i, atomic_t * v) -+static __inline__ int atomic_sub_return(int i, atomic_t * v) - { - unsigned long temp, result; - -- cgit v1.3 From 83090f6ae7eb5353049b253f74670d72d9387463 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Feb 2017 11:11:13 +0100 Subject: gnu: util-linux: Update to 2.29.2. * gnu/packages/linux.scm (util-linux): Update to 2.29.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 eadd18f78..03b7e295d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -475,7 +475,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.29.1") + (version "2.29.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -483,7 +483,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "0kzmhb2swiqk402jp0y2jsx53l42d7z4xz3bzbn2zv1lp400dr0c")) + "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.3 From 378618640da836d5a892f48ad64dda8465652127 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2017 21:45:44 -0500 Subject: gnu: eudev: Update to 3.2.1. * gnu/packages/linux.scm (eudev): Update to 3.2.1. --- 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 03b7e295d..b3fd9d260 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1732,7 +1732,7 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2") + (version "3.2.1") (source (origin (method url-fetch) (uri (string-append @@ -1740,7 +1740,7 @@ from the module-init-tools project.") version ".tar.gz")) (sha256 (base32 - "099w62ncq78nxpxizf910mx18hc8x4qvzw3azjd00fir89wmyjnq")) + "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.3 From f0a01af5c6e297f9068e4f359488e9fd0417fad2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2017 21:59:09 -0500 Subject: gnu: eudev: Fix build failure caused by conflicting function type declaration. * gnu/packages/patches/eudev-conflicting-declaration.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (eudev)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 3 ++- .../patches/eudev-conflicting-declaration.patch | 31 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/eudev-conflicting-declaration.patch (limited to 'gnu/packages/linux.scm') diff --git a/gnu/local.mk b/gnu/local.mk index ec9332271..fbf0552af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -541,6 +541,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/eudev-conflicting-declaration.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b3fd9d260..fe72f98b7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1741,7 +1741,8 @@ from the module-init-tools project.") (sha256 (base32 "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp")) - (patches (search-patches "eudev-rules-directory.patch")))) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-conflicting-declaration.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/patches/eudev-conflicting-declaration.patch b/gnu/packages/patches/eudev-conflicting-declaration.patch new file mode 100644 index 000000000..f5399e20d --- /dev/null +++ b/gnu/packages/patches/eudev-conflicting-declaration.patch @@ -0,0 +1,31 @@ +Fix build failure due to conflicting declaration of +keyboard_lookup_key() in gperf-3.1: + +https://bugs.gentoo.org/show_bug.cgi?id=604864 + +Patch copied from upstream source repository: + +https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 + +From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Thu, 5 Jan 2017 16:21:17 -0500 +Subject: [PATCH] src/udev/udev-builtin-keyboard.c: fix build with gperf 3.1 + +Signed-off-by: Anthony G. Basile +--- + src/udev/udev-builtin-keyboard.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c +index 73171c3..fad3520 100644 +--- a/src/udev/udev-builtin-keyboard.c ++++ b/src/udev/udev-builtin-keyboard.c +@@ -28,7 +28,6 @@ + + #include "udev.h" + +-static const struct key *keyboard_lookup_key(const char *str, unsigned len); + #include "keyboard-keys-from-name.h" + #include "keyboard-keys-to-name.h" + -- cgit v1.3 From b9375d89443f2ce55a4f659fd95097982489d55c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Feb 2017 23:39:14 +0100 Subject: gnu: kmod: Update to 24. * gnu/packages/linux.scm (kmod): Update to 24. --- 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 fe72f98b7..71d459792 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1687,7 +1687,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (define-public kmod (package (name "kmod") - (version "23") + (version "24") (source (origin (method url-fetch) (uri @@ -1695,7 +1695,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") "kmod-" version ".tar.xz")) (sha256 (base32 - "0mc12sx06p8il1ym3hdmgxxb37apn9yv7xij26gddjdfkx8xa0yk")) + "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1")) (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.3 From 212c775c9cf6263770ea686eaed9bcf867a68bcd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Feb 2017 23:40:09 +0100 Subject: gnu: bluez: Update to 5.44. * gnu/packages/linux.scm (bluez): Update to 5.44. --- 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 71d459792..c1e495675 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2618,7 +2618,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.43") + (version "5.44") (source (origin (method url-fetch) (uri (string-append @@ -2626,7 +2626,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "05cdnpz0w2lwq2x5ba87q1h2wgb4lfnpbnbh6p7499hx59fw1j8n")))) + "11bc6pndivd0rkqr3c8a1xd9ar9bb60gx79piskycicb3wliwchc")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.3