diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-fs/lvm2/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sys-fs/lvm2/files')
-rw-r--r-- | sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 | 25 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm.confd-2.02.28-r2 | 5 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm.rc-2.02.105-r2 | 96 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch | 32 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch | 50 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch | 104 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch | 52 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch | 102 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch | 32 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch | 63 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch | 127 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch | 15 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 | 12 |
13 files changed, 0 insertions, 715 deletions
diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 deleted file mode 100644 index f77996caa577..000000000000 --- a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -PIDFILE=/run/dmeventd.pid -BIN=/sbin/dmeventd - -depend() { - # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that - # means dmeventd is NOT notified, as it cannot be safely running - after lvm device-mapper -} - -start() { - ebegin "Starting dmeventd" - start-stop-daemon --start --exec $BIN --pidfile $PIDFILE - eend $? -} - -stop() { - ebegin "Stopping dmeventd" - start-stop-daemon --stop --exec $BIN --pidfile $PIDFILE - eend $? -} - diff --git a/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 b/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 deleted file mode 100644 index 2fbd8668c376..000000000000 --- a/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 +++ /dev/null @@ -1,5 +0,0 @@ -# LVM should normally only be started after mdraid is available -# this is because LVM physical volumes are very often MD devices. -RC_AFTER="mdraid" - -# vim: ft=gentoo-conf-d diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 deleted file mode 100644 index 937db047d198..000000000000 --- a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 +++ /dev/null @@ -1,96 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before checkfs fsck - after modules device-mapper - need lvmetad sysfs -} - -config='global { locking_dir = "/run/lock/lvm" }' - -dm_in_proc() { - local retval=0 - for x in devices misc ; do - grep -qs 'device-mapper' /proc/${x} - retval=$((${retval} + $?)) - done - return ${retval} -} - -start() { - # LVM support for /usr, /home, /opt .... - # This should be done *before* checking local - # volumes, or they never get checked. - - # NOTE: Add needed modules for LVM or RAID, etc - # to /etc/modules.autoload if needed - for lvm_path in /bin/lvm /sbin/lvm ; do - [ -x "$lvm_path" ] && break - done - if [ ! -x "$lvm_path" ]; then - eerror "Cannot find lvm binary in /sbin or /bin!" - return 1 - fi - if [ -z "${CDBOOT}" ] ; then - if [ -e /proc/modules ] && ! dm_in_proc ; then - modprobe dm-mod 2>/dev/null - fi - if [ -d /proc/lvm ] || dm_in_proc ; then - ebegin "Setting up the Logical Volume Manager" - #still echo stderr for debugging - lvm_commands="#! ${lvm_path} --config '${config}'\n" - # Extra PV find pass because some devices might not have been available until very recently - lvm_commands="${lvm_commands}pvscan\n" - # Now make the nodes - lvm_commands="${lvm_commands}vgscan --mknodes\n" - # And turn them on! - lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" - # Order of this is important, have to work around dash and LVM readline - printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null - eend $? "Failed to setup the LVM" - fi - fi -} - -stop() { - for lvm_path in /bin/lvm /sbin/lvm ; do - [ -x "$lvm_path" ] && break - done - if [ ! -x "$lvm_path" ]; then - eerror "Cannot find lvm binary in /sbin or /bin!" - return 1 - fi -# Stop LVM2 -if [ -x /sbin/vgs ] && \ - [ -x /sbin/vgchange ] && \ - [ -x /sbin/lvchange ] && \ - [ -f /etc/lvmtab -o -d /etc/lvm ] && \ - [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ] -then - einfo "Shutting down the Logical Volume Manager" - - - VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null) - - if [ "$VGS" ] - then - ebegin " Shutting Down LVs & VGs" - #still echo stderr for debugging - lvm_commands="#! ${lvm_path} --config '${config}'\n" - # Extra PV find pass because some devices might not have been available until very recently - lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n" - # Now make the nodes - lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n" - # Order of this is important, have to work around dash and LVM readline - printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null - eend $? "Failed (possibly some LVs still needed for /usr or root)" - fi - - einfo "Finished shutting down the Logical Volume Manager" - return 0 -fi -} - -# vim:ts=4 diff --git a/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch deleted file mode 100644 index 594d60617259..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -Make sure that libdm usage always brings in pthread libraries, both in -pkgconfig and during manual build. - ---- tools/Makefile.in -+++ tools/Makefile.in -@@ -87,6 +87,7 @@ - INSTALL_LVM_TARGETS += install_tools_static - INSTALL_DMSETUP_TARGETS += install_dmsetup_static - INSTALL_CMDLIB_TARGETS += install_cmdlib_static -+ STATIC_LIBS += @PTHREAD_LIBS@ - endif - - LVMLIBS = $(LVMINTERNAL_LIBS) -@@ -118,6 +119,10 @@ - - include $(top_builddir)/make.tmpl - -+ifeq ("@STATIC_LINK@", "yes") -+ STATIC_LIBS += @PTHREAD_LIBS@ -+endif -+ - device-mapper: $(TARGETS_DM) - - CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) ---- libdm/libdevmapper.pc.in -+++ libdm/libdevmapper.pc.in -@@ -8,4 +8,5 @@ - Version: @DM_LIB_PATCHLEVEL@ - Cflags: -I${includedir} - Libs: -L${libdir} -ldevmapper -+Libs.private: -L${libdir} @PTHREAD_LIBS@ - Requires.private: @SELINUX_PC@ @UDEV_PC@ diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch deleted file mode 100644 index af5a5afe258d..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch +++ /dev/null @@ -1,50 +0,0 @@ -Maintainer note: Forward ported without editing from lvm2-2.02.99-example.conf.in.patch to apply cleanly. - ---- conf/example.conf.in -+++ conf/example.conf.in -@@ -105,6 +105,10 @@ - # By default we accept every block device: - # filter = [ "a/.*/" ] - -+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel -+ # noise when you probed while not available. -+ filter = [ "r|/dev/nbd.*|", "a/.*/" ] -+ - # Exclude the cdrom drive - # filter = [ "r|/dev/cdrom|" ] - -@@ -522,7 +526,8 @@ - # e.g. vgscan.lvm1 and they will stop working after you start using - # the new lvm2 on-disk metadata format. - # The default value is set when the tools are built. -- # fallback_to_lvm1 = 0 -+ # Gentoo: the LVM tools are a seperate package. -+ fallback_to_lvm1 = 0 - - # The default metadata format that commands should use - "lvm1" or "lvm2". - # The command line override is -M1 or -M2. -@@ -1182,12 +1187,13 @@ - - # Metadata settings - # --# metadata { -+metadata { - # Default number of copies of metadata to hold on each PV. 0, 1 or 2. - # You might want to override it from the command line with 0 - # when running pvcreate on new PVs which are to be added to large VGs. - -- # pvmetadatacopies = 1 -+ # Gentoo: enable for data safety, but PV resize is then disabled. -+ # pvmetadatacopies = 2 - - # Default number of copies of metadata to maintain for each VG. - # If set to a non-zero value, LVM automatically chooses which of -@@ -1222,7 +1228,7 @@ - # the supplied toolset to make changes (e.g. vgcfgrestore). - - # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] --#} -+} - - # Event daemon - # diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch deleted file mode 100644 index 3ab699868a5d..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch +++ /dev/null @@ -1,104 +0,0 @@ -Maintainer note: Forward ported without editing from lvm2-2.02.107-static-pkgconfig-libs.patch to apply cleanly. - ---- configure.in -+++ configure.in -@@ -1067,6 +1067,7 @@ - fi]) - if test "$BLKID_WIPING" = yes; then - BLKID_PC="blkid" -+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` - AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) - fi - fi -@@ -1092,6 +1093,7 @@ - if test "$UDEV_SYNC" = yes; then - pkg_config_init - PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) -+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` - AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) - fi - -@@ -1312,19 +1314,32 @@ - if test "$SELINUX" = yes; then - AC_CHECK_LIB([sepol], [sepol_check_context], [ - AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) -- SELINUX_LIBS="-lsepol"]) -+ SEPOL_LIBS="-lsepol"]) -+ -+ dnl -- init pkgconfig if required -+ if test x$PKGCONFIG_INIT != x1; then -+ pkg_config_init -+ fi -+ PKG_CHECK_MODULES(SELINUX, libselinux, [ -+ SELINUX_PC="libselinux" -+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` -+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" -+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -+ ],[ -+ dnl -- old non-pkgconfig method, is buggy with static builds - - AC_CHECK_LIB([selinux], [is_selinux_enabled], [ - AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) - AC_CHECK_HEADERS([selinux/label.h]) - AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -- SELINUX_LIBS="-lselinux $SELINUX_LIBS" -+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" - SELINUX_PC="libselinux" - HAVE_SELINUX=yes ], [ - AC_MSG_WARN(Disabling selinux) - SELINUX_LIBS= - SELINUX_PC= - HAVE_SELINUX=no ]) -+ ]) - fi - - ################################################################################ -@@ -1626,6 +1641,7 @@ - ################################################################################ - AC_SUBST(APPLIB) - AC_SUBST(AWK) -+AC_SUBST(BLKID_STATIC_LIBS) - AC_SUBST(BLKID_PC) - AC_SUBST(BLKID_WIPING) - AC_SUBST(BUILD_CMIRRORD) -@@ -1721,6 +1737,7 @@ - AC_SUBST(SALCK_CFLAGS) - AC_SUBST(SALCK_LIBS) - AC_SUBST(SELINUX_LIBS) -+AC_SUBST(SELINUX_STATIC_LIBS) - AC_SUBST(SELINUX_PC) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -@@ -1735,6 +1752,7 @@ - AC_SUBST(CACHE_DUMP_CMD) - AC_SUBST(CACHE_REPAIR_CMD) - AC_SUBST(CACHE_RESTORE_CMD) -+AC_SUBST(UDEV_STATIC_LIBS) - AC_SUBST(UDEV_PC) - AC_SUBST(UDEV_RULES) - AC_SUBST(UDEV_SYNC) ---- make.tmpl.in -+++ make.tmpl.in -@@ -43,7 +43,7 @@ - - LIBS = @LIBS@ - # Extra libraries always linked with static binaries --STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) -+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS += @CFLAGS@ -@@ -57,10 +57,13 @@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - READLINE_LIBS = @READLINE_LIBS@ - SELINUX_LIBS = @SELINUX_LIBS@ -+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ - UDEV_CFLAGS = @UDEV_CFLAGS@ - UDEV_LIBS = @UDEV_LIBS@ -+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ - BLKID_CFLAGS = @BLKID_CFLAGS@ - BLKID_LIBS = @BLKID_LIBS@ -+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ - TESTING = @TESTING@ - - # Setup directory variables diff --git a/sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch deleted file mode 100644 index 076e06080ca3..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch +++ /dev/null @@ -1,52 +0,0 @@ -Maintainer note: Forward ported without editing from lvm2-2.02.108-example.conf.in.patch to apply cleanly. - ---- LVM2.2.02.129/conf/example.conf.in -+++ LVM2.2.02.129/conf/example.conf.in -@@ -128,6 +128,9 @@ - # Example - # Accept every block device: - # filter = [ "a|.*/|" ] -+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel -+ # noise when you probed while not available. -+ filter = [ "r|/dev/nbd.*|", "a/.*/" ] - # Reject the cdrom drive: - # filter = [ "r|/dev/cdrom|" ] - # Work with just loopback devices, e.g. for testing: -@@ -620,7 +623,8 @@ - # tools need to be installed with .lvm1 suffices, e.g. vgscan.lvm1. - # They will stop working once the lvm2 on-disk metadata format is used. - # This configuration option has an automatic default value. -- # fallback_to_lvm1 = @DEFAULT_FALLBACK_TO_LVM1@ -+ # Gentoo: the LVM tools are a seperate package. -+ fallback_to_lvm1 = 0 - - # Configuration option global/format. - # The default metadata format that commands should use. -@@ -1413,7 +1417,7 @@ - - # Configuration section metadata. - # This configuration section has an automatic default value. --# metadata { -+metadata { - - # Configuration option metadata/pvmetadatacopies. - # Number of copies of metadata to store on each PV. -@@ -1431,7 +1435,8 @@ - # - # This configuration option is advanced. - # This configuration option has an automatic default value. -- # pvmetadatacopies = 1 -+ # Gentoo: enable for data safety, but PV resize is then disabled. -+ # pvmetadatacopies = 2 - - # Configuration option metadata/vgmetadatacopies. - # Number of copies of metadata to maintain for each VG. -@@ -1486,7 +1491,7 @@ - # - # This configuration option is advanced. - # This configuration option does not have a default value defined. --# } -+} - - # Configuration section report. - # LVM report command output formatting. diff --git a/sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch deleted file mode 100644 index 239694523b3d..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- LVM2.2.02.129/configure.in -+++ LVM2.2.02.129/configure.in -@@ -1287,6 +1287,7 @@ - fi]) - if test "$BLKID_WIPING" = yes; then - BLKID_PC="blkid" -+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` - DEFAULT_USE_BLKID_WIPING=1 - AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) - else -@@ -1332,6 +1333,7 @@ - if test "$UDEV_SYNC" = yes; then - pkg_config_init - PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) -+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` - AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) - fi - -@@ -1558,19 +1560,32 @@ - if test "$SELINUX" = yes; then - AC_CHECK_LIB([sepol], [sepol_check_context], [ - AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) -- SELINUX_LIBS="-lsepol"]) -+ SEPOL_LIBS="-lsepol"]) -+ -+ dnl -- init pkgconfig if required -+ if test x$PKGCONFIG_INIT != x1; then -+ pkg_config_init -+ fi -+ PKG_CHECK_MODULES(SELINUX, libselinux, [ -+ SELINUX_PC="libselinux" -+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` -+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" -+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -+ ],[ -+ dnl -- old non-pkgconfig method, is buggy with static builds - - AC_CHECK_LIB([selinux], [is_selinux_enabled], [ - AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) - AC_CHECK_HEADERS([selinux/label.h]) - AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) -- SELINUX_LIBS="-lselinux $SELINUX_LIBS" -+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" - SELINUX_PC="libselinux" - HAVE_SELINUX=yes ], [ - AC_MSG_WARN(Disabling selinux) - SELINUX_LIBS= - SELINUX_PC= - HAVE_SELINUX=no ]) -+ ]) - fi - - ################################################################################ -@@ -1902,6 +1917,7 @@ - ################################################################################ - AC_SUBST(APPLIB) - AC_SUBST(AWK) -+AC_SUBST(BLKID_STATIC_LIBS) - AC_SUBST(BLKID_PC) - AC_SUBST(BUILD_CMIRRORD) - AC_SUBST(BUILD_DMEVENTD) -@@ -2005,6 +2021,7 @@ - AC_SUBST(SALCK_CFLAGS) - AC_SUBST(SALCK_LIBS) - AC_SUBST(SELINUX_LIBS) -+AC_SUBST(SELINUX_STATIC_LIBS) - AC_SUBST(SELINUX_PC) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -@@ -2020,6 +2037,7 @@ - AC_SUBST(CACHE_DUMP_CMD) - AC_SUBST(CACHE_REPAIR_CMD) - AC_SUBST(CACHE_RESTORE_CMD) -+AC_SUBST(UDEV_STATIC_LIBS) - AC_SUBST(UDEV_PC) - AC_SUBST(UDEV_RULES) - AC_SUBST(UDEV_SYNC) ---- LVM2.2.02.129/make.tmpl.in -+++ LVM2.2.02.129/make.tmpl.in -@@ -43,7 +43,7 @@ - - LIBS = @LIBS@ - # Extra libraries always linked with static binaries --STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) -+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ -@@ -58,10 +58,13 @@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - READLINE_LIBS = @READLINE_LIBS@ - SELINUX_LIBS = @SELINUX_LIBS@ -+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ - UDEV_CFLAGS = @UDEV_CFLAGS@ - UDEV_LIBS = @UDEV_LIBS@ -+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ - BLKID_CFLAGS = @BLKID_CFLAGS@ - BLKID_LIBS = @BLKID_LIBS@ -+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ - VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ - TESTING = @TESTING@ - diff --git a/sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch deleted file mode 100644 index 11db632e2e7e..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -Make sure that libdm usage always brings in pthread libraries, both in -pkgconfig and during manual build. - ---- LVM2.2.02.130/libdm/libdevmapper.pc.in -+++ LVM2.2.02.130/libdm/libdevmapper.pc.in -@@ -9,4 +9,4 @@ - Cflags: -I${includedir} - Libs: -L${libdir} -ldevmapper - Requires.private: @SELINUX_PC@ @UDEV_PC@ --Libs.private: -lm @RT_LIB@ -+Libs.private: -lm @RT_LIB@ @PTHREAD_LIBS@ ---- LVM2.2.02.130/tools/Makefile.in -+++ LVM2.2.02.130/tools/Makefile.in -@@ -90,6 +90,7 @@ - INSTALL_LVM_TARGETS += install_tools_static - INSTALL_DMSETUP_TARGETS += install_dmsetup_static - INSTALL_CMDLIB_TARGETS += install_cmdlib_static -+ STATIC_LIBS += @PTHREAD_LIBS@ - endif - - LVMLIBS = $(LVMINTERNAL_LIBS) -@@ -120,6 +121,10 @@ - - include $(top_builddir)/make.tmpl - -+ifeq ("@STATIC_LINK@", "yes") -+ STATIC_LIBS += @PTHREAD_LIBS@ -+endif -+ - device-mapper: $(TARGETS_DM) - - CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) diff --git a/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch deleted file mode 100644 index 312e546e2403..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -ur LVM2.2.02.139_O/configure.in LVM2.2.02.139/configure.in ---- LVM2.2.02.139_O/configure.in 2016-01-19 12:54:33.155187005 +0000 -+++ LVM2.2.02.139/configure.in 2016-01-19 12:56:39.487181372 +0000 -@@ -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" -@@ -2009,6 +2010,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) -diff -ur LVM2.2.02.139_O/daemons/dmeventd/Makefile.in LVM2.2.02.139/daemons/dmeventd/Makefile.in ---- LVM2.2.02.139_O/daemons/dmeventd/Makefile.in 2016-01-19 12:54:33.278186999 +0000 -+++ LVM2.2.02.139/daemons/dmeventd/Makefile.in 2016-01-19 12:57:44.277178484 +0000 -@@ -67,7 +67,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") -diff -ur LVM2.2.02.139_O/make.tmpl.in LVM2.2.02.139/make.tmpl.in ---- LVM2.2.02.139_O/make.tmpl.in 2016-01-19 12:54:33.529186988 +0000 -+++ LVM2.2.02.139/make.tmpl.in 2016-01-19 12:58:31.514176378 +0000 -@@ -49,6 +49,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@ -diff -ur LVM2.2.02.139_O/tools/Makefile.in LVM2.2.02.139/tools/Makefile.in ---- LVM2.2.02.139_O/tools/Makefile.in 2016-01-08 18:51:21.000000000 +0000 -+++ LVM2.2.02.139/tools/Makefile.in 2016-01-19 13:00:08.349172060 +0000 -@@ -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 $(M_LIBS) $(PTHREAD_LIBS) $(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 diff --git a/sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch b/sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch deleted file mode 100644 index f91dccd5c188..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch +++ /dev/null @@ -1,127 +0,0 @@ -https://bugs.gentoo.org/580062 - -From 2a1d0fa8ea765604cd8274aac5aa7876f1c145c9 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 19 Apr 2016 23:53:22 -0400 -Subject: [PATCH] convert major/minor/makedev handling - -Most of the files in here use MAJOR/MINOR/MKDEV macros, but a few -missed it. Update the defines in those files to match them. ---- - daemons/cmirrord/functions.c | 16 ++++++++++++---- - daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c | 12 ++++++++++-- - lib/filters/filter-sysfs.c | 6 ++++-- - 3 files changed, 26 insertions(+), 8 deletions(-) - -diff --git a/daemons/cmirrord/functions.c b/daemons/cmirrord/functions.c -index e9d3c09..5b3cb38 100644 ---- a/daemons/cmirrord/functions.c -+++ b/daemons/cmirrord/functions.c -@@ -20,6 +20,14 @@ - #include <time.h> - #include <unistd.h> - -+#ifdef __linux__ -+# include "kdev_t.h" -+#else -+# define MAJOR(x) major((x)) -+# define MINOR(x) minor((x)) -+# define MKDEV(x,y) makedev((x),(y)) -+#endif -+ - #define BYTE_SHIFT 3 - - /* -@@ -333,8 +341,8 @@ static int find_disk_path(char *major_minor_str, char *path_rtn, int *unlink_pat - continue; - } - if (S_ISBLK(statbuf.st_mode) && -- (major(statbuf.st_rdev) == major) && -- (minor(statbuf.st_rdev) == minor)) { -+ (MAJOR(statbuf.st_rdev) == major) && -+ (MINOR(statbuf.st_rdev) == minor)) { - LOG_DBG(" %s: YES", dep->d_name); - if (closedir(dp)) - LOG_DBG("Unable to closedir /dev/mapper %s", -@@ -1451,7 +1459,7 @@ static int disk_status_info(struct log_c *lc, struct dm_ulog_request *rq) - } - - r = sprintf(data, "3 clustered-disk %d:%d %c", -- major(statbuf.st_rdev), minor(statbuf.st_rdev), -+ MAJOR(statbuf.st_rdev), MINOR(statbuf.st_rdev), - (lc->log_dev_failed) ? 'D' : 'A'); - if (r < 0) - return r; -@@ -1514,7 +1522,7 @@ static int disk_status_table(struct log_c *lc, struct dm_ulog_request *rq) - } - - r = sprintf(data, "clustered-disk %d:%d %u %s%s ", -- major(statbuf.st_rdev), minor(statbuf.st_rdev), -+ MAJOR(statbuf.st_rdev), MINOR(statbuf.st_rdev), - lc->region_size, - (lc->sync == DEFAULTSYNC) ? "" : - (lc->sync == NOSYNC) ? "nosync " : "sync ", -diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c -index 7b060ed..4098203 100644 ---- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c -+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c -@@ -20,6 +20,14 @@ - #include <stdarg.h> - #include <pthread.h> - -+#ifdef __linux__ -+# include "kdev_t.h" -+#else -+# define MAJOR(x) major((x)) -+# define MINOR(x) minor((x)) -+# define MKDEV(x,y) makedev((x),(y)) -+#endif -+ - /* First warning when snapshot is 80% full. */ - #define WARNING_THRESH (DM_PERCENT_1 * 80) - /* Run a check every 5%. */ -@@ -148,8 +156,8 @@ static void _umount(const char *device, int major, int minor) - continue; /* can't stat, skip this one */ - - if (S_ISBLK(st.st_mode) && -- major(st.st_rdev) == major && -- minor(st.st_rdev) == minor) { -+ MAJOR(st.st_rdev) == major && -+ MINOR(st.st_rdev) == minor) { - log_error("Unmounting invalid snapshot %s from %s.", device, words[1]); - if (!_run(UMOUNT_COMMAND, "-fl", words[1], NULL)) - log_error("Failed to umount snapshot %s from %s: %s.", -diff --git a/lib/filters/filter-sysfs.c b/lib/filters/filter-sysfs.c -index 3115f86..5f76e8b 100644 ---- a/lib/filters/filter-sysfs.c -+++ b/lib/filters/filter-sysfs.c -@@ -19,6 +19,8 @@ - - #include <dirent.h> - -+#include "kdev_t.h" -+ - static int _locate_sysfs_blocks(const char *sysfs_dir, char *path, size_t len, - unsigned *sysfs_depth) - { -@@ -120,7 +122,7 @@ static struct dev_set *_dev_set_create(struct dm_pool *mem, - - static unsigned _hash_dev(dev_t dev) - { -- return (major(dev) ^ minor(dev)) & (SET_BUCKETS - 1); -+ return (MAJOR(dev) ^ MINOR(dev)) & (SET_BUCKETS - 1); - } - - /* -@@ -171,7 +173,7 @@ static int _parse_dev(const char *file, FILE *fp, dev_t *result) - return 0; - } - -- *result = makedev(major, minor); -+ *result = MKDEV(major, minor); - return 1; - } - --- -2.7.4 - diff --git a/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch deleted file mode 100644 index 1bae0db10c1d..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/330255 - -liblvm2app.so: undefined reference to `floor' - ---- LVM2/liblvm/Makefile.in -+++ LVM2/liblvm/Makefile.in -@@ -39,7 +39,7 @@ - - include $(top_builddir)/make.tmpl - --LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -+LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -lm - - ifeq ("@DMEVENTD@", "yes") - LIBS += -ldevmapper-event diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 deleted file mode 100644 index 565f49c7c426..000000000000 --- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/lvmetad.pid" -command="/sbin/lvmetad" -command_args="${LVMETAD_OPTS:=-p ${pidfile}}" -start_stop_daemon_args="--pidfile ${pidfile}" - -depend() { - : -} |