sys-fs/lvm2: remove unused patch/files
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Tue, 12 Feb 2019 16:37:57 +0000 (17:37 +0100)
committerAaron Bauman <bman@gentoo.org>
Wed, 27 Feb 2019 05:35:25 +0000 (00:35 -0500)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Signed-off-by: Aaron Bauman <bman@gentoo.org>
sys-fs/lvm2/files/clvmd.confd-2.02.39 [deleted file]
sys-fs/lvm2/files/clvmd.rc-2.02.39 [deleted file]
sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch [deleted file]

diff --git a/sys-fs/lvm2/files/clvmd.confd-2.02.39 b/sys-fs/lvm2/files/clvmd.confd-2.02.39
deleted file mode 100644 (file)
index 5782170..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum.
-
-CLVMD_CLUSTER_TIMEOUT=30
-
-
-# CLVMD_NODES_TIMEOUT -- amount of time to wait for the other nodes to
-# join the cluster.
-
-CLVMD_NODES_TIMEOUT=60
diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39
deleted file mode 100644 (file)
index efadd89..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
-
-[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30
-[ -n "$CLVMD_NODES_TIMEOUT" ] || CLVMD_NODES_TIMEOUT=60
-
-VGCHANGE="/sbin/vgchange"
-VGSCAN="/sbin/vgscan"
-VGDISPLAY="/sbin/vgdisplay"
-CLVMD_PIDFILE="/var/run/clvmd.pid"
-
-depend() {
-       use net dns logger dmeventd
-       want cman corosync openais
-}
-
-load_modules() {
-       local module modules
-       modules=$1
-       
-       for module in ${modules}; do
-               ebegin "Loading ${module} kernel module"
-               modprobe ${module}
-               eend $? "Failed to load ${module} kernel module"
-       done
-}
-
-unload_modules() {
-       local module modules
-       modules=$1
-       
-       for module in ${modules}; do
-               ebegin "Unloading ${module} kernel module"
-               modprobe -r ${module}
-               eend $? "Failed to unload ${module} kernel module"
-       done
-}
-
-umount_gfs_filesystems() {
-       local sig retry
-       local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-
-       if [ -n "${remaining}" ]
-       then
-               sig=
-               retry=3
-               while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-               do
-                       if [ "${retry}" -lt 3 ]
-                       then
-                               ebegin "Unmounting GFS filesystems (retry)"
-                               umount ${remaining} &>/dev/null
-                               eend $? "Failed to unmount GFS filesystems this retry"
-                       else
-                               ebegin "Unmounting GFS filesystems"
-                               umount ${remaining} &>/dev/null
-                               eend $? "Failed to unmount GFS filesystems"
-                       fi
-                       remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-                       [ -z "${remaining}" ] && break
-                       /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
-                       sleep 5
-                       retry=$((${retry} -1))
-                       sig=-9
-               done
-       fi
-}
-
-
-start_volumes() {
-       ebegin "Scanning LVM volumes"
-       $VGSCAN > /dev/null 2>&1
-       eend $?
-
-       ret=$?
-       if [ "$ret" -eq 5 ]
-       then
-               einfo "  Waiting for other nodes to join the cluster ($CLVMD_NODES_TIMEOUT seconds)"
-       fi
-
-       clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
-       for vg in $clustervgs; do
-               ebegin "  Activating Clustered VG: ${vg} "
-
-               wait=0
-               while [ -n "$($VGCHANGE -a y ${vg} 2>&1 |grep "clvmd not running")" ]; do
-                       if [ $wait -lt $CLVMD_NODES_TIMEOUT ]; then
-                               sleep 3
-                               wait=$(($wait + 3))
-                       else
-                               eend 1
-                       fi
-               done
-               eend 0
-       done
-}
-
-stop_volumes() {
-       # Deactivate only clustered volumes
-       clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
-       for vg in $clustervgs; do
-               ebegin "  Shutting Down Clustered VG: ${vg} "
-               $VGCHANGE -anl ${vg} >/dev/null
-               eend $?
-       done
-}
-
-
-start() {
-       local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
-
-       if [ -z "${module}" ]; then
-               load_modules "dm-mod"
-               sleep 1s
-       fi
-
-       ebegin "Starting clvmd ($CLVMD_CLUSTER_TIMEOUT seconds)"
-
-       start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT}
-       eend $?
-
-       start_volumes
-}
-
-stop() {
-
-       # umount GFS filesystems
-       umount_gfs_filesystems
-
-       #stop_volumes
-
-       ebegin "Stopping clvmd"
-       #start-stop-daemon --stop -s TERM --quiet --exec ${CLVMD_BIN} --name clvmd
-       killall -TERM ${CLVMD_BIN} >/dev/null
-       eend $?
-
-        #local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules)
-
-       #if [[ "$?" -eq 0 && ! -z "${module}" ]]; then
-        #        unload_modules "dm-mod"
-        #fi
-}
diff --git a/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch
deleted file mode 100644 (file)
index efdfb81..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
---- LVM2.2.02.129/configure.in
-+++ LVM2.2.02.129/configure.in
-@@ -31,6 +31,7 @@
-       linux*)
-               CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
-               ELDFLAGS="-Wl,--export-dynamic"
-+              STATIC_LDFLAGS="-Wl,--no-export-dynamic"
-               # FIXME Generate list and use --dynamic-list=.dlopen.sym
-               CLDWHOLEARCHIVE="-Wl,-whole-archive"
-               CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-@@ -2008,6 +2009,7 @@
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-+AC_SUBST(STATIC_LDFLAGS)
- AC_SUBST(STATIC_LINK)
- AC_SUBST(TESTING)
- AC_SUBST(TESTSUITE_DATA)
---- LVM2.2.02.129/daemons/dmeventd/Makefile.in
-+++ LVM2.2.02.129/daemons/dmeventd/Makefile.in
-@@ -66,7 +66,7 @@
-       $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
- 
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
--      $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-+      $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-       dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
- 
- ifeq ("@PKGCONFIG@", "yes")
---- LVM2.2.02.129/make.tmpl.in
-+++ LVM2.2.02.129/make.tmpl.in
-@@ -48,6 +48,7 @@
- # FIXME set this only where it's needed, not globally?
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
- LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@
- CLDFLAGS += @CLDFLAGS@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@
---- LVM2.2.02.129/tools/Makefile.in
-+++ LVM2.2.02.129/tools/Makefile.in
-@@ -129,7 +129,7 @@
-             -o $@ dmsetup.o -ldevmapper $(LIBS)
- 
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
--      $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+      $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
-             -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
- 
- all: device-mapper
-@@ -146,7 +146,7 @@
- endif
- 
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
--      $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+      $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-             $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
- 
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o