diff options
Diffstat (limited to 'sys-fs/lvm2/files')
10 files changed, 0 insertions, 484 deletions
diff --git a/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch deleted file mode 100644 index 1cbf956db258..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/make.tmpl.in b/make.tmpl.in -index a40eaaa15..7eea943aa 100644 ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -53,7 +53,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile - - LIBS = @LIBS@ - # Extra libraries always linked with static binaries --STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) -+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) $(M_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ diff --git a/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch deleted file mode 100644 index c0265e81268a..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- LVM2.2.02.176/libdm/libdevmapper.pc.in -+++ LVM2.2.02.176/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_LIBS@ -+Libs.private: -lm @RT_LIBS@ @PTHREAD_LIBS@ ---- LVM2.2.02.176/tools/Makefile.in -+++ LVM2.2.02.176/tools/Makefile.in -@@ -93,6 +93,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) -ldevmapper -@@ -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) diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch deleted file mode 100644 index c831c6d6e60c..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/330255 - -liblvm2app.so: undefined reference to `floor' - ---- LVM2.2.02.178/liblvm/Makefile.in -+++ LVM2.2.02.178/liblvm/Makefile.in -@@ -43,7 +43,7 @@ - include $(top_builddir)/make.tmpl - - LDFLAGS += -L$(top_builddir)/lib -L$(top_builddir)/daemons/dmeventd --LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio -+LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio -lm - - .PHONY: install_dynamic install_static install_include install_pkgconfig - diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch deleted file mode 100644 index 0a0e73209062..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- LVM2.2.02.178/configure.ac -+++ LVM2.2.02.178/configure.ac -@@ -33,6 +33,7 @@ - CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - 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" -@@ -2042,6 +2043,7 @@ - AC_SUBST(SYSTEMD_LIBS) - AC_SUBST(SNAPSHOTS) - AC_SUBST(STATICDIR) -+AC_SUBST(STATIC_LDFLAGS) - AC_SUBST(STATIC_LINK) - AC_SUBST(TESTSUITE_DATA) - AC_SUBST(THIN) ---- LVM2.2.02.178/daemons/dmeventd/Makefile.in -+++ LVM2.2.02.178/daemons/dmeventd/Makefile.in -@@ -64,7 +64,7 @@ - -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) - - dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a -- $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ - -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS) - - ifeq ("@PKGCONFIG@", "yes") ---- LVM2.2.02.178/make.tmpl.in -+++ LVM2.2.02.178/make.tmpl.in -@@ -64,6 +64,7 @@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ - LDFLAGS ?= @LDFLAGS@ -+STATIC_LDFLAGS += @STATIC_LDFLAGS@ - CLDFLAGS += @CLDFLAGS@ - ELDFLAGS += @ELDFLAGS@ - LDDEPS += @LDDEPS@ ---- LVM2.2.02.178/tools/Makefile.in -+++ LVM2.2.02.178/tools/Makefile.in -@@ -129,7 +129,7 @@ - - dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a - @echo " [CC] $@" -- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ -+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) - - all: device-mapper -@@ -159,7 +159,7 @@ - - lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a - @echo " [CC] $@" -- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ -+ $(Q) $(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.178-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch deleted file mode 100644 index 34c710d4392c..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- LVM2.2.02.178/conf/example.conf.in -+++ LVM2.2.02.178/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: -@@ -704,7 +707,8 @@ - # Configuration option global/fallback_to_lvm1. - # This setting is no longer used. - # This configuration option has an automatic default value. -- # fallback_to_lvm1 = 0 -+ # Gentoo: the LVM tools are a seperate package. -+ fallback_to_lvm1 = 0 - - # Configuration option global/format. - # This setting is no longer used. -@@ -1508,7 +1512,7 @@ - - # Configuration section metadata. - # This configuration section has an automatic default value. --# metadata { -+metadata { - - # Configuration option metadata/check_pv_device_sizes. - # Check device sizes are not smaller than corresponding PV sizes. -@@ -1553,7 +1557,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. -@@ -1608,7 +1613,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.178-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch deleted file mode 100644 index 989b3082576d..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- LVM2.2.02.178/configure.ac -+++ LVM2.2.02.178/configure.ac -@@ -1238,6 +1238,7 @@ - PKG_CHECK_MODULES(BLKID, blkid >= 2.24, - [ BLKID_WIPING=yes - 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.]) - ], [if test "$BLKID_WIPING" = maybe; then -@@ -1286,6 +1287,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.]) - - AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1, -@@ -1564,19 +1566,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 - - ################################################################################ -@@ -1927,6 +1942,7 @@ - ################################################################################ - AC_SUBST(APPLIB) - AC_SUBST(AWK) -+AC_SUBST(BLKID_STATIC_LIBS) - AC_SUBST(BLKID_PC) - AC_SUBST(BUILD_CMIRRORD) - AC_SUBST(BUILD_DMEVENTD) -@@ -2037,6 +2053,7 @@ - AC_SUBST(SALCK_LIBS) - AC_SUBST(SBINDIR) - AC_SUBST(SELINUX_LIBS) -+AC_SUBST(SELINUX_STATIC_LIBS) - AC_SUBST(SELINUX_PC) - AC_SUBST(SYSCONFDIR) - AC_SUBST(SYSTEMD_LIBS) -@@ -2053,6 +2070,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.178/make.tmpl.in -+++ LVM2.2.02.178/make.tmpl.in -@@ -59,7 +59,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@ -@@ -75,10 +75,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@ - SYSTEMD_LIBS = @SYSTEMD_LIBS@ - VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ - diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch b/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch deleted file mode 100644 index 34968c7c2eb7..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a397b69ce33d811aba7d64d54b5c8e0efb86fd15 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Fri, 10 May 2019 14:40:11 +0200 -Subject: [PATCH] metadata: allow reading metadata with invalid creation_time - -lvm2 till version 2.02.169 (commit 78d004efa8a1809cea68283e6204edfa9d7c1091) -was printing invalid creation_time argument into metadata on 32bit arch. - -However with commit ba9820b14223b731125c83dbc9709aa44fdcdbf1 we started -to properly validate all input numbers and thus we refused to accept -invalid metadata with 'garbage' string - but this results in the -situation where metadata produced on older lvm2 on 32 bit architecture -will become unreadable after upgrade. - -To fix this case - extend libdm parser in a way, that whenever we -find error integer value, we also check if the parsed value is not for -creation_time node and in this case we let the metadata pass through -with made-up date 2018-05-24 (release date of 2.02.169). ---- - libdm/libdm-config.c | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c -index 3f0d2510e..382f86bbf 100644 ---- a/libdm/libdm-config.c -+++ b/libdm/libdm-config.c -@@ -51,6 +51,8 @@ struct parser { - - struct dm_pool *mem; - int no_dup_node_check; /* whether to disable dup node checking */ -+ const char *key; /* last obtained key */ -+ unsigned ignored_creation_time; - }; - - struct config_output { -@@ -176,7 +178,7 @@ static int _do_dm_config_parse(struct dm_config_tree *cft, const char *start, co - /* TODO? if (start == end) return 1; */ - - struct parser *p; -- if (!(p = dm_pool_alloc(cft->mem, sizeof(*p)))) -+ if (!(p = dm_pool_zalloc(cft->mem, sizeof(*p)))) - return_0; - - p->mem = cft->mem; -@@ -615,6 +617,7 @@ static struct dm_config_node *_section(struct parser *p, struct dm_config_node * - match(TOK_SECTION_E); - } else { - match(TOK_EQ); -+ p->key = root->key; - if (!(value = _value(p))) - return_NULL; - if (root->v) -@@ -682,8 +685,17 @@ static struct dm_config_value *_type(struct parser *p) - errno = 0; - v->v.i = strtoll(p->tb, NULL, 0); /* FIXME: check error */ - if (errno) { -- log_error("Failed to read int token."); -- return NULL; -+ if (errno == ERANGE && p->key && -+ strcmp("creation_time", p->key) == 0) { -+ /* Due to a bug in some older 32bit builds (<2.02.169), -+ * lvm was able to produce invalid creation_time string */ -+ v->v.i = 1527120000; /* Pick 2018-05-24 day instead */ -+ if (!p->ignored_creation_time++) -+ log_warn("WARNING: Invalid creation_time found in metadata (repaired with next metadata update)."); -+ } else { -+ log_error("Failed to read int token."); -+ return NULL; -+ } - } - match(TOK_INT); - break; diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch deleted file mode 100644 index c80bd2ba2bec..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: "Robin H. Johnson" <robbat2@gentoo.org> -Date: Wed, 17 Apr 2019 06:54:27 +0000 -Subject: [PATCH] dmeventd configurable idle exit time - -dmeventd nominally exits after 1 hour of idle time. There are use cases for -this, esp. with socket activation, but also cases where users don't expect -dmeventd to exit. - -Provide a tuning knob via environment variable, DMEVENTD_IDLE_EXIT_TIMEOUT, -that can be -1 to not exit, or a configurable time for different idle exit. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -Fixes: https://bugs.gentoo.org/682556 - -diff -Nuar LVM2.2.02.184.orig/daemons/dmeventd/dmeventd.c LVM2.2.02.184/daemons/dmeventd/dmeventd.c ---- LVM2.2.02.184.orig/daemons/dmeventd/dmeventd.c 2019-03-22 03:14:59.000000000 -0700 -+++ LVM2.2.02.184/daemons/dmeventd/dmeventd.c 2019-04-17 00:18:23.535029906 -0700 -@@ -2158,6 +2158,18 @@ - .server_path = DM_EVENT_FIFO_SERVER - }; - time_t now, idle_exit_timeout = DMEVENTD_IDLE_EXIT_TIMEOUT; -+ -+ /* Provide a basic way to config the idle timeout */ -+ char* idle_exit_timeout_env = getenv("DMEVENTD_IDLE_EXIT_TIMEOUT") ? : NULL; -+ if(NULL != idle_exit_timeout_env) { -+ char* endptr; -+ idle_exit_timeout = strtol(idle_exit_timeout_env, &endptr, 10); -+ if (errno == ERANGE || *endptr != '\0') { -+ fprintf(stderr, "DMEVENTD_IDLE_EXIT_TIMEOUT: bad time input\n"); -+ exit(EXIT_FAILURE); -+ } -+ } -+ - opterr = 0; - optind = 0; - -@@ -2253,7 +2265,7 @@ - _process_initial_registrations(); - - for (;;) { -- if (_idle_since) { -+ if (_idle_since || _exit_now) { - if (_exit_now) { - if (_exit_now == DM_SCHEDULED_EXIT) - break; /* Only prints shutdown message */ -@@ -2262,7 +2274,7 @@ - (long) (time(NULL) - _idle_since)); - break; - } -- if (idle_exit_timeout) { -+ if (idle_exit_timeout && idle_exit_timeout > 0) { - now = time(NULL); - if (now < _idle_since) - _idle_since = now; /* clock change? */ -diff -Nuar LVM2.2.02.184.orig/man/dmeventd.8_main LVM2.2.02.184/man/dmeventd.8_main ---- LVM2.2.02.184.orig/man/dmeventd.8_main 2019-03-22 03:15:00.000000000 -0700 -+++ LVM2.2.02.184/man/dmeventd.8_main 2019-04-17 00:17:46.076023638 -0700 -@@ -143,6 +143,10 @@ - Variable is set by thin plugin to prohibit recursive interation - with dmeventd by any executed lvm2 command from - a thin_command environment. -+.TP -+.B DMEVENTD_IDLE_EXIT_TIMEOUT -+Configure the dmeventd idle exit timeout behavior, value in seconds. Default -+is 3600 (1 hour). -1 means do not exit. - . - .SH SEE ALSO - . diff --git a/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch b/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch deleted file mode 100644 index f895e1921e09..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f98f79a047dd1c4980008e0ed6c9ad4e18596cdc Mon Sep 17 00:00:00 2001 -From: Peter Rajnoha <prajnoha@redhat.com> -Date: Tue, 13 Aug 2019 15:18:30 +0200 -Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule - -The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216, -that is ~5 years ago. - -Since systemd/udev version 243, there's a new message printed if unsupported -OPTIONS value is used: - - Invalid value for OPTIONS key, ignoring: 'event_timeout=180' - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666 ---- - udev/11-dm-lvm.rules.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in -index 91cb991df9..7c589943b7 100644 ---- a/udev/11-dm-lvm.rules.in -+++ b/udev/11-dm-lvm.rules.in -@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE - - ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" - --OPTIONS+="event_timeout=180" -- - # Do not create symlinks for inappropriate subdevices. - ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" - ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" --- -2.24.0 - diff --git a/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch b/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch deleted file mode 100644 index 5ddcb4e56711..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nuar --exclude '*~' LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in LVM2.2.02.63/daemons/dmeventd/Makefile.in ---- LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in 2010-04-09 14:42:48.000000000 -0700 -+++ LVM2.2.02.63/daemons/dmeventd/Makefile.in 2010-04-19 11:53:27.000000000 -0700 -@@ -28,11 +28,12 @@ - INSTALL_LIB_TARGETS = install_lib_dynamic - - LIB_NAME = libdevmapper-event -+LIB_STATIC = $(LIB_NAME).a -+INSTALL_LIB_TARGETS += install_lib_static -+TARGETS += $(LIB_STATIC) - ifeq ("@STATIC_LINK@", "yes") -- LIB_STATIC = $(LIB_NAME).a -- TARGETS += $(LIB_STATIC) dmeventd.static -+ TARGETS += dmeventd.static - INSTALL_DMEVENTD_TARGETS += install_dmeventd_static -- INSTALL_LIB_TARGETS += install_lib_static - endif - - LIB_VERSION = $(LIB_VERSION_DM) -diff -Nuar --exclude '*~' LVM2.2.02.63.orig/libdm/Makefile.in LVM2.2.02.63/libdm/Makefile.in ---- LVM2.2.02.63.orig/libdm/Makefile.in 2010-04-09 14:42:51.000000000 -0700 -+++ LVM2.2.02.63/libdm/Makefile.in 2010-04-19 11:52:20.000000000 -0700 -@@ -34,8 +34,8 @@ - - INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) - --ifeq ("@STATIC_LINK@", "yes") - LIB_STATIC = $(interface)/libdevmapper.a -+ifeq ("@STATIC_LINK@", "yes") - endif - - LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) -@@ -63,8 +63,8 @@ - - INSTALL_TYPE = install_dynamic - --ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static -+ifeq ("@STATIC_LINK@", "yes") - endif - - ifeq ("@PKGCONFIG@", "yes") |