[PATCH 0/3] LVM2 update

[PATCH 0/3] LVM2 update

[Leo Famulari]

This updates LVM2 to the latest upstream release, and also makes sure
the compiled objects can be stripped.

GRUB depends on LVM2, so I reconfigured and rebooted on x86_64 bare
metal.

Leo Famulari (3):
  gnu: lvm2: Use 'modify-phases'.
  gnu: lvm2: Update to 2.02.166.
  gnu: lvm2: Make sure compiled objects are stripped.

 gnu/packages/linux.scm | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

-- 
2.10.0

[PATCH 1/3] gnu: lvm2: Use 'modify-phases'.

[Leo Famulari]

* gnu/packages/linux.scm (lvm2)[arguments]: Use 'modify-phases'.
---
 gnu/packages/linux.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 693558f..28a2e81 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1657,16 +1657,17 @@ time.")
     (inputs
      `(("udev" ,eudev)))
     (arguments
-     '(#:phases (alist-cons-after
-                 'configure 'set-makefile-shell
-                 (lambda _
-                   ;; Use 'sh', not 'bash', so that '. lib/utils.sh' works as
-                   ;; expected.
-                   (setenv "SHELL" (which "sh"))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'set-makefile-shell
+           (lambda _
+             ;; Use 'sh', not 'bash', so that '. lib/utils.sh' works as
+             ;; expected.
+             (setenv "SHELL" (which "sh"))
 
-                   ;; Replace /bin/sh with the right file name.
-                   (patch-makefile-SHELL "make.tmpl"))
-                 %standard-phases)
+             ;; Replace /bin/sh with the right file name.
+             (patch-makefile-SHELL "make.tmpl")
+             #t)))
 
        #:configure-flags (list (string-append "--sysconfdir="
                                               (assoc-ref %outputs "out")
-- 
2.10.0

Re: [PATCH 1/3] gnu: lvm2: Use 'modify-phases'.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/linux.scm (lvm2)[arguments]: Use 'modify-phases'.

OK!

[PATCH 2/3] gnu: lvm2: Update to 2.02.166.

[Leo Famulari]

* gnu/packages/linux.scm (lvm2): Update to 2.02.166.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 28a2e81..d977be1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1631,14 +1631,14 @@ time.")
 (define-public lvm2
   (package
     (name "lvm2")
-    (version "2.02.109")
+    (version "2.02.166")
     (source (origin
               (method url-fetch)
               (uri (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
                                   version ".tgz"))
               (sha256
                (base32
-                "1rv5ivg0l1w3nwzwdkqixm96h5bzg7ib4rr196ysb2lw42jmpjbv"))
+                "150v0mawd2swdvypcmkjd3h3s4n5i1220h6sxx94a8jvp1kb0871"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.10.0

Re: [PATCH 2/3] gnu: lvm2: Update to 2.02.166.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/linux.scm (lvm2): Update to 2.02.166.

OK!

[PATCH 3/3] gnu: lvm2: Make sure compiled objects are stripped.

[Leo Famulari]

* gnu/packages/linux.scm (lvm2)[arguments]: Add 'make-objects-writeable' phase.
---
 gnu/packages/linux.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d977be1..91c7a8a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1667,7 +1667,17 @@ time.")
 
              ;; Replace /bin/sh with the right file name.
              (patch-makefile-SHELL "make.tmpl")
-             #t)))
+             #t))
+         (add-before 'strip 'make-objects-writable
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Make compiled objects writable so they can be stripped.
+             (let ((out (assoc-ref outputs "out")))
+               (for-each (lambda (file)
+                           (chmod file #o755))
+                         (append
+                           (find-files (string-append out "/lib"))
+                           (find-files (string-append out "/sbin"))))
+               #t))))
 
        #:configure-flags (list (string-append "--sysconfdir="
                                               (assoc-ref %outputs "out")
-- 
2.10.0

Re: [PATCH 3/3] gnu: lvm2: Make sure compiled objects are stripped.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/linux.scm (lvm2)[arguments]: Add 'make-objects-writeable' phase.

OK, thanks!

Ludo’.