Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (987eab10d1e99de1a6033f75ff497dc74912da8d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (987eab10d1e99de1a6033f75ff497dc74912da8d)
  • Date: Tue, 29 Aug 2017 07:04:24 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

disk/lvm/HISTORY | 4 ++++
disk/lvm/lvm-static-hotfix.patch | 24 ++++++++++++++++++------
2 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 987eab10d1e99de1a6033f75ff497dc74912da8d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lvm: Fix dmeventd.static and lvm.static missing -lm in LDFLAGS

Refresh lvm-static-hotfix.patch to 2.02.171

diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index bb02cae..954ae42 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,7 @@
+2017-08-28 Eric Sandall <sandalle AT sourcemage.org>
+ * lvm-static-hotfix.patch: Refresh to 2.02.171
+ Fix dmeventd.static and lvm.static missing -lm in LDFLAGS
+
2017-06-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.02.171
* lvm-static-dmstats.patcH: deleted
diff --git a/disk/lvm/lvm-static-hotfix.patch
b/disk/lvm/lvm-static-hotfix.patch
index dc0d350..fb98388 100644
--- a/disk/lvm/lvm-static-hotfix.patch
+++ b/disk/lvm/lvm-static-hotfix.patch
@@ -1,7 +1,19 @@
-diff -Naur LVM2.2.02.145.orig/tools/Makefile.in
LVM2.2.02.145/tools/Makefile.in
---- LVM2.2.02.145.orig/tools/Makefile.in 2016-03-04 10:03:29.000000000
-0800
-+++ LVM2.2.02.145/tools/Makefile.in 2016-03-16 11:48:31.705347528 -0700
-@@ -130,7 +130,7 @@
+diff -Naur LVM2.2.02.171.orig/daemons/dmeventd/Makefile.in
LVM2.2.02.171/daemons/dmeventd/Makefile.in
+--- LVM2.2.02.171.orig/daemons/dmeventd/Makefile.in 2017-08-28
23:54:14.525826374 -0700
++++ LVM2.2.02.171/daemons/dmeventd/Makefile.in 2017-08-28 23:57:59.031726462
-0700
+@@ -67,7 +67,7 @@
+
+ dmeventd.static: $(LIB_STATIC) dmeventd.o
$(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L.
-L$(interfacebuilddir) -o $@ \
+- dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
++ dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS) -lm
+
+ ifeq ("@PKGCONFIG@", "yes")
+ INSTALL_LIB_TARGETS += install_pkgconfig
+diff -Naur LVM2.2.02.171.orig/tools/Makefile.in
LVM2.2.02.171/tools/Makefile.in
+--- LVM2.2.02.171.orig/tools/Makefile.in 2017-08-28 23:54:14.576827474
-0700
++++ LVM2.2.02.171/tools/Makefile.in 2017-08-28 23:54:36.258293501 -0700
+@@ -134,7 +134,7 @@

dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
@@ -10,12 +22,12 @@ diff -Naur LVM2.2.02.145.orig/tools/Makefile.in
LVM2.2.02.145/tools/Makefile.in

all: device-mapper

-@@ -147,7 +147,7 @@
+@@ -161,7 +161,7 @@

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)
-luuid -pthread
++ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) -lm
-luuid -pthread

liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o
lvm2cmd.o
cat $(top_builddir)/lib/liblvm-internal.a > $@



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (987eab10d1e99de1a6033f75ff497dc74912da8d), Eric Sandall, 08/29/2017

Archive powered by MHonArc 2.6.24.

Top of Page