GNU logs - #34465, boring messages


Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#34465] [PATCH] gnu: lvm2: Update to 2.03.02.
Resent-From: Marius Bakke <mbakke@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 12 Feb 2019 23:24:01 +0000
Resent-Message-ID: <handler.34465.B.15500137905870 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 34465
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 34465 <at> debbugs.gnu.org
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.15500137905870
          (code B ref -1); Tue, 12 Feb 2019 23:24:01 +0000
Received: (at submit) by debbugs.gnu.org; 12 Feb 2019 23:23:10 +0000
Received: from localhost ([127.0.0.1]:45448 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1gthOP-0001Wc-PP
	for submit <at> debbugs.gnu.org; Tue, 12 Feb 2019 18:23:10 -0500
Received: from eggs.gnu.org ([209.51.188.92]:50148)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mbakke@HIDDEN>) id 1gthON-0001WO-Rz
 for submit <at> debbugs.gnu.org; Tue, 12 Feb 2019 18:23:08 -0500
Received: from lists.gnu.org ([209.51.188.17]:60872)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <mbakke@HIDDEN>) id 1gthOI-000644-K8
 for submit <at> debbugs.gnu.org; Tue, 12 Feb 2019 18:23:02 -0500
Received: from eggs.gnu.org ([209.51.188.92]:36253)
 by lists.gnu.org with esmtp (Exim 4.71)
 (envelope-from <mbakke@HIDDEN>) id 1gthOG-0001ao-Ts
 for guix-patches@HIDDEN; Tue, 12 Feb 2019 18:23:02 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_05,FREEMAIL_FROM,
 RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.3.2
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <mbakke@HIDDEN>) id 1gthOE-0005ww-Rv
 for guix-patches@HIDDEN; Tue, 12 Feb 2019 18:23:00 -0500
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:48865)
 by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <mbakke@HIDDEN>) id 1gthOC-0005lX-3a
 for guix-patches@HIDDEN; Tue, 12 Feb 2019 18:22:56 -0500
Received: from compute5.internal (compute5.nyi.internal [10.202.2.45])
 by mailout.nyi.internal (Postfix) with ESMTP id 10A5C21B5A
 for <guix-patches@HIDDEN>; Tue, 12 Feb 2019 18:22:50 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
 by compute5.internal (MEProxy); Tue, 12 Feb 2019 18:22:50 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h=
 from:to:subject:date:message-id:mime-version
 :content-transfer-encoding; s=fm2; bh=zciMPdmAmWJRKe6fzUqaVviP78
 Oji83m0XpAp+zMyPU=; b=1DOglXZs3uiN8PsS0Q33LdB8pFlgoVplgeK3zxfqYf
 GgJXWfl2Nbki5WLSIxBK70J06iMjuPJ6SUgmMmVjgAsDVhP3y2VMwe9reSijN8wf
 fttjlA2ltXcKU9xPoAdr/F1bIY7ny9LtLWvIp3+9HbqSDFidn2yeTj08UeQA7gRl
 eL/aCWE7q8tHoZ8sjyV2zav0Q4romYdIzawhIJw5Pw4Pu6Z+J4GFpuuopG5bUmCP
 FCROQFhU6Vtxgn5vh/ghT28wRb69XkakCyARrsHsEthriycGDvSd1K6tiz1pUCRF
 tkt1rZkvUzPd9nbQmJdz7W5myNY/X3rtg4B/aXtrgpvw==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=content-transfer-encoding:date:from
 :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=zciMPdmAmWJRKe6fz
 UqaVviP78Oji83m0XpAp+zMyPU=; b=cFXhumWE2JHh3PlByeQF3wlKFuhlZQ9Pz
 B1VDy/YWjEWV95lFsbE+bwAmwuvykoBb2iU4VEfOWQl7xnaEx3OMS3THN0MzRq4M
 Q41opFxU+ZBzaLgPScMEYGyHwGMLlnJhQ7wLbWDZOjsbKoNfVYyaEvBdCVhVqYyt
 ctVQWEeJRJ8WUpZRctWZwnOtszzEtMw78Su4ZtwKWTuCaW1DEcNQPTi24DwNiPdH
 xFZH4ROJghRxS3VyvAosAtxQUg8Uuj54O8LTpJPQ2TIta/bTuQMFKB+aJ6Oz2x2U
 c6yBbMBnflCTxbiqZBjjD7OT3h10oGr2c+gbjGvn/l9jsoGlNoNNA==
X-ME-Sender: <xms:SVVjXBIjRF_rJ1mU41C9tF927DZZ2FuTjKCXhgUtRNWM7v5Kk1J65w>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtvddgtdelucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef
 tddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeforg
 hrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucff
 ohhmrghinheprhgvughhrghtrdgtohhmpdhtmhhplhdrihhnnecukfhppeeivddrudeird
 dvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshht
 mhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd
X-ME-Proxy: <xmx:SVVjXOab9lMXygy20t8jfEYx2iV377wYYuNUnU9OzdWQttf9ai2wZQ>
 <xmx:SVVjXPC_uMlDuGprmpwKEtNkt4PHo3IVjFKjm25gfUvuTssyC3uclg>
 <xmx:SVVjXAXrk8A88xmkQ-PnjHjDYoyxSHiCy9yBCLpGGbESXw0iGBbjHA>
 <xmx:SlVjXEqOobn1FEckPp3FXNczJitIUWNHHw-2Rv7vI3AMZ7sXYDIdtQ>
Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140])
 by mail.messagingengine.com (Postfix) with ESMTPA id 7CA4DE409D
 for <guix-patches@HIDDEN>; Tue, 12 Feb 2019 18:22:49 -0500 (EST)
From: Marius Bakke <mbakke@HIDDEN>
Date: Wed, 13 Feb 2019 00:22:48 +0100
Message-Id: <20190212232248.31909-1-mbakke@HIDDEN>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 66.111.4.26
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Spam-Score: 0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.3 (/)

* gnu/packages/linux.scm (lvm2): Update to 2.03.02.
[source](snippet): Adjust confdir regex.
[inputs]: Add LIBAIO.
[arguments]: Add phase 'patch-configure.
(lvm2-static)[arguments]: Don't build dmeventd.  Add phase 'adjust-Makefile'.
---
 gnu/packages/linux.scm                      | 37 ++++++++++++++++++---
 gnu/packages/patches/lvm2-static-link.patch | 29 +++++++++++-----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c4080f9285..28e30583e7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2138,14 +2138,14 @@ time.")
 (define-public lvm2
   (package
     (name "lvm2")
-    (version "2.02.177")
+    (version "2.03.02")
     (source (origin
               (method url-fetch)
               (uri (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
                                   version ".tgz"))
               (sha256
                (base32
-                "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0"))
+                "03vjdkjxw04pggqzdmznpc3gbzmzr9jpb1y9a9z5pmwz4d8af2sm"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -2153,7 +2153,7 @@ time.")
 
                   ;; Honor sysconfdir.
                   (substitute* "make.tmpl.in"
-                    (("confdir = .*$")
+                    (("^confdir = .*$")
                      "confdir = @sysconfdir@\n")
                     (("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@")
                      "DEFAULT_SYS_DIR = @sysconfdir@"))
@@ -2164,10 +2164,18 @@ time.")
      `(("pkg-config" ,pkg-config)
        ("procps" ,procps)))                       ;tests use 'pgrep'
     (inputs
-     `(("udev" ,eudev)))
+     `(("libaio" ,libaio)
+       ("udev" ,eudev)))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-before 'configure 'patch-configure
+           (lambda _
+             ;; XXX: Passing both LDFLAGS and CLDFLAGS causes a syntax error
+             ;; in 2.03.02.  They are identical anyway.
+             (substitute* "configure"
+               (("CLDFLAGS:\"\\$LDFLAGS\"") "CLDFLAGS"))
+             #t))
          (add-after 'configure 'set-makefile-shell
            (lambda _
              ;; Use 'sh', not 'bash', so that '. lib/utils.sh' works as
@@ -2229,7 +2237,26 @@ mapper.  Kernel components are part of Linux-libre.")
      (substitute-keyword-arguments (package-arguments lvm2)
        ((#:configure-flags flags '())
         ;; LVM2 doesn't use Libtool, hence the custom option.
-        `(cons "--enable-static_link" ,flags))))
+        `(append '("--enable-static_link")
+                 ;; Building dmeventd statically is complicated due to a
+                 ;; requirement on libdevmapper.a, which is being phased out
+                 ;; in favor of libdevice-mapper.a, which in turn is is not
+                 ;; easily made available at dmeventd build time.  Just ignore
+                 ;; it until the situation improves.
+                 (delete "--enable-dmeventd" ,flags)))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-before 'configure 'adjust-Makefile
+             (lambda _
+               ;; Fix leftovers related to upstream libdm->device_mapper
+               ;; migration, hopefully not needed for versions > 2.03.02.
+               (substitute* "tools/Makefile.in"
+                 ;; This variable is empty in a static configuration and causes
+                 ;; an erroneous GCC command line.
+                 (("-L\\$\\(interfacebuilddir\\)") "")
+                 ;; Remove obsolete reference to libdevmapper.a.
+                 (("-ldevmapper") ""))
+               #t))))))
     (synopsis "Logical volume management for Linux (statically linked)")))
 
 (define-public wireless-tools
diff --git a/gnu/packages/patches/lvm2-static-link.patch b/gnu/packages/patches/lvm2-static-link.patch
index eb7849a679..2ade0a1aaa 100644
--- a/gnu/packages/patches/lvm2-static-link.patch
+++ b/gnu/packages/patches/lvm2-static-link.patch
@@ -3,23 +3,34 @@ and libm via libdevmapper.a.
 
 --- LVM2.2.02.166/tools/Makefile.in	2016-11-22 21:31:15.521045149 +0100
 +++ LVM2.2.02.166/tools/Makefile.in	2016-11-22 21:31:24.085082767 +0100
-@@ -148,7 +148,7 @@ endif
- 
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
--	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
-+	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(M_LIBS)
+@@ -137,7 +137,7 @@
+ lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS)
+ 	@echo "    [CC] $@"
+ 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \
+-	      $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS)
++	      $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) $(PTHREAD_LIBS)
  
  liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
- 	cat $(top_builddir)/lib/liblvm-internal.a > $@
+ 	@echo "    [AR] $@"
 --- a/make.tmpl.in     2018-07-31 22:00:39.969983104 +0200
 +++ b/make.tmpl.in     2018-07-31 22:00:58.467613682 +0200
-@@ -53,7 +53,7 @@
+@@ -63,7 +63,7 @@
  
- LIBS = @LIBS@
+ LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) $(M_LIBS)
  # Extra libraries always linked with static binaries
 -STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
 +STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(M_LIBS)
  DEFS += @DEFS@
  # FIXME set this only where it's needed, not globally?
  CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+--- a/libdm/make.tmpl.in	2018-12-18 15:22:34.000000000 +0100
++++ b/libdm/make.tmpl.in	2019-01-29 21:45:33.637345799 +0100
+@@ -57,7 +57,7 @@
+ LIBS = @LIBS@
+ LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
++STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(PTHREAD_LIBS) $(M_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
-- 
2.20.1





Message sent:


Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Marius Bakke <mbakke@HIDDEN>
Subject: bug#34465: Acknowledgement ([PATCH] gnu: lvm2: Update to 2.03.02.)
Message-ID: <handler.34465.B.15500137905870.ack <at> debbugs.gnu.org>
References: <20190212232248.31909-1-mbakke@HIDDEN>
X-Gnu-PR-Message: ack 34465
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 34465 <at> debbugs.gnu.org
Date: Tue, 12 Feb 2019 23:24:01 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 34465 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
34465: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D34465
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems



Last modified: Tue, 12 Feb 2019 23:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.