From e8ec2dda08d36f3a8d17f840980ea82585d1fc38 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 26 Jul 2018 09:13:52 +1000 Subject: gnu: ecryptfs-utils: Patch more hardcoded paths. * gnu/packages/linux.scm (ecryptfs-utils): [arguments]: Add an additional file to be patched that was missing in the last fix. Ecryptfs will now find the umount binary path as well as mount and others. Re-sort the list of files to be substituted. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7ecc795b1f..70615df93c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3714,10 +3714,12 @@ as used on certified hardware security devices.") (substitute* '("src/utils/ecryptfs-mount-private" "src/utils/ecryptfs-umount-private" "src/utils/ecryptfs-setup-private" + "src/utils/ecryptfs-setup-swap" "src/utils/mount.ecryptfs.c" + "src/utils/umount.ecryptfs.c" "src/pam_ecryptfs/pam_ecryptfs.c" "src/desktop/ecryptfs-mount-private.desktop.in" - "src/utils/ecryptfs-setup-swap") + "src/desktop/ecryptfs-setup-private.desktop.in") (("/bin/mount") (string-append utils-linux "/bin/mount")) (("/bin/umount") -- cgit v1.2.3 From 4262a491ce8cf0beaa1ddfa0fc9bc3e115de699a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:29:42 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.145. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.145. --- 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 70615df93c..1cfe76ec8a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.144" - "1001nw9d51vbiisrjv5ffqigcwfs0r9gav2f8hkw9hzjw64nhanp" + (make-linux-libre "4.4.145" + "1c8lcibc6f8194ix3paip30jb9cqvn4lni6jjskyrmavcfy4rlbp" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 8b30bc82dc11754555ecee6da5dd8cdb09afdfd8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:30:32 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.116. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.116. --- 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 1cfe76ec8a..29bcfb7859 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,8 +423,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.115" - "12n3wwfz22hxqqy7bdchl894x5krylcd4vx65837w7rybnb5w2wj" + (make-linux-libre "4.9.116" + "1v5138a5317ddrl0zvlip18586si68ccw6y5wdxgpkh8ixvcamy6" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c85a76cc005a440f9ba52b5936dd2729c1c35e8e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:31:10 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.59. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.59. (%linux-libre-4.14-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 29bcfb7859..4f9c29f8e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,8 @@ It has been modified to remove all non-free binary blobs.") %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.58") -(define %linux-libre-4.14-hash "1ny2b5zmgvbxglpy88aicdxix2ygr1qmar2rgaa336czfjninwr5") +(define %linux-libre-4.14-version "4.14.59") +(define %linux-libre-4.14-hash "1mf22i8a71qs04x4wfqmm21clj4jnqia6rpk7jbh3r3vjfjjbd1d") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From f8e2df9851941d337219bef66a6dd8cec7f3a0e8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:32:03 -0400 Subject: gnu: linux-libre: Update to 4.17.11. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.17.11. (%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 4f9c29f8e0..f1bf65d27a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,8 +404,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.17.10") -(define %linux-libre-hash "1ab349s18avigd2592i11pab4klqzzxy11a1zp16mb842d8chkj2") +(define %linux-libre-version "4.17.11") +(define %linux-libre-hash "0c0ryl8rnzizr0x2gj9kprj9wfjz536574fnn46r0ww3szrzdm78") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From a3ed69b694eab393129348bbabbed8c59bad3772 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 30 May 2018 13:17:53 +0200 Subject: gnu: lvm2: Add device-mapper-event support. * GNU/packages/linux.scm (lvm2)[configure-flags]: Build device-mapper-event. --- gnu/packages/linux.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1bf65d27a..61f44100bf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2127,12 +2127,24 @@ time.") "--enable-udev_sync" "--enable-udev_rules" "--enable-pkgconfig" + "--enable-cmdlib" + "--enable-dmeventd" ; Requires '--enable-cmdlib'. ;; Make sure programs such as 'dmsetup' can ;; find libdevmapper.so. (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") - "/lib")) + "/lib,-rpath=" + (assoc-ref %outputs "out") + "/lib/device-mapper") + ;; TODO: Patch make.tmpl.in to take LDFLAGS + ;; into account so that we don't need to also + ;; set CLDFLAGS. + (string-append "CLDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib,-rpath=" + (assoc-ref %outputs "out") + "/lib/device-mapper")) ;; The tests use 'mknod', which requires root access. #:tests? #f)) -- cgit v1.2.3