diff options
author | David Seifert <soap@gentoo.org> | 2023-01-13 12:11:29 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2023-01-13 12:11:29 +0100 |
commit | 12dbea87d40f1e338ae9ca7f9b4afdbb2114df2d (patch) | |
tree | bf3850e8ab35867dc7c1ff0f3ea9f1a880ecc2d6 /sys-fs | |
parent | media-gfx/fontforge: add 20230101 (diff) | |
download | gentoo-12dbea87d40f1e338ae9ca7f9b4afdbb2114df2d.tar.gz gentoo-12dbea87d40f1e338ae9ca7f9b4afdbb2114df2d.tar.bz2 gentoo-12dbea87d40f1e338ae9ca7f9b4afdbb2114df2d.zip |
sys-fs/lvm2: drop 2.03.14-r5
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/lvm2/Manifest | 1 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch | 12 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch | 13 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch | 11 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch | 48 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch | 56 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch | 76 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch | 37 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch | 24 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch | 18 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.03.14-r5.ebuild | 312 |
11 files changed, 0 insertions, 608 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 5d8395d11f1b..97f6f93fc328 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,2 +1 @@ -DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9 diff --git a/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch b/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch deleted file mode 100644 index 0f830e428b10..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/device/dev-io.c -+++ b/lib/device/dev-io.c -@@ -505,7 +505,9 @@ - dev->flags |= DEV_NOT_O_NOATIME; - if ((dev->fd = open(name, flags, 0777)) >= 0) { - log_debug_devs("%s: Not using O_NOATIME", name); -+#ifdef O_DIRECT_SUPPORT - goto opened; -+#endif - } - } - #endif diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch b/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch deleted file mode 100644 index 49c6853f23a7..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/686652 - ---- LVM2.2.02.184/tools/Makefile.in -+++ LVM2.2.02.184/tools/Makefile.in -@@ -220,6 +220,6 @@ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ - echo -en "const char _command_input[] =\n\n\"" && \ - $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \ -- echo "\\n\";" \ -+ printf "%s\n" "\\n\";" \ - ) > $@ - - $(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h cmds.h diff --git a/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch deleted file mode 100644 index fe7ec87931e3..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- LVM2/make.tmpl.in -+++ LVM2/make.tmpl.in -@@ -395,7 +395,7 @@ - ( cat $(srcdir)/.exported_symbols; \ - if test x$(EXPORTED_HEADER) != x; then \ - $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \ -- $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ -+ LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ - fi \ - ) > $@ - diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch deleted file mode 100644 index 56aa2a7b79fc..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.05-pthread-pkgconfig.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dbb68df8d02eff87f10df331e17bd0940e158f56 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <robbat2@gentoo.org> -Date: Wed, 24 Jul 2019 11:15:59 +0200 -Subject: [PATCH] Add pthread to libdevmapper pkgconfig file - -Forward-ported from 2.02.176 to 2.03.05 -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - libdm/libdevmapper.pc.in | 2 +- - tools/Makefile.in | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libdm/libdevmapper.pc.in b/libdm/libdevmapper.pc.in -index a325aeb9e0..aa0980378f 100644 ---- a/libdm/libdevmapper.pc.in -+++ b/libdm/libdevmapper.pc.in -@@ -9,4 +9,4 @@ Version: @DM_LIB_PATCHLEVEL@ - 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@ -diff --git a/tools/Makefile.in b/tools/Makefile.in -index e5fc9c4ae4..12e4de2c63 100644 ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -87,6 +87,7 @@ ifeq ("@STATIC_LINK@", "yes") - TARGETS += lvm.static - INSTALL_LVM_TARGETS += install_tools_static - INSTALL_CMDLIB_TARGETS += install_cmdlib_static -+ STATIC_LIBS += @PTHREAD_LIBS@ - endif - - LVMLIBS = $(SYSTEMD_LIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS) -laio -@@ -113,6 +114,10 @@ CFLOW_TARGET = lvm - - include $(top_builddir)/make.tmpl - -+ifeq ("@STATIC_LINK@", "yes") -+ STATIC_LIBS += @PTHREAD_LIBS@ -+endif -+ - device-mapper: - - all: device-mapper --- -2.22.0 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch deleted file mode 100644 index 329bfde6ca91..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a26cc1e7e299b61d1877ead03aacafef9fbe81ff Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <robbat2@gentoo.org> -Date: Fri, 25 Oct 2019 08:45:17 +0200 -Subject: [PATCH] Add Gentoo specific changes - -Forward-ported from 2.03.05 to 2.03.06 -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - conf/example.conf.in | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/conf/example.conf.in b/conf/example.conf.in -index 05b0857920..33ffb0097c 100644 ---- a/conf/example.conf.in -+++ b/conf/example.conf.in -@@ -143,6 +143,9 @@ devices { - # 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: -@@ -1680,7 +1683,7 @@ activation { - - # 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. -@@ -1725,7 +1728,8 @@ activation { - # - # 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. -@@ -1768,7 +1772,7 @@ activation { - # This configuration option is advanced. - # This configuration option has an automatic default value. - # stripesize = 64 --# } -+} - - # Configuration section report. - # LVM report command output formatting. --- -2.24.0.rc1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch deleted file mode 100644 index 80b6bc7a023f..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.12-dynamic-static-ldflags.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 4bdd215fd84e83a8119d0b971904221743a87a23 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <robbat2@gentoo.org> -Date: Wed, 24 Jul 2019 11:11:35 +0200 -Subject: [PATCH] Add dynamic static ldflags - -Forward-ported from 2.02.178 to 2.03.05 -Forward-ported from 2.03.05 to 2.03.12 -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - configure.ac | 2 ++ - daemons/dmeventd/Makefile.in | 2 +- - make.tmpl.in | 1 + - tools/Makefile.in | 2 +- - 4 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1a49e7fe7e..354b53b5ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,6 +32,7 @@ case "$host_os" in - linux*) - # 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" -@@ -1860,6 +1861,7 @@ AC_SUBST(SYSCONFDIR) - 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) -diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in -index af51198aae..f7896e581e 100644 ---- a/daemons/dmeventd/Makefile.in -+++ b/daemons/dmeventd/Makefile.in -@@ -76,7 +76,7 @@ dmeventd: $(LIB_SHARED) dmeventd.o - - dmeventd.static: $(LIB_STATIC) dmeventd.o - @echo " [CC] $@" -- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static dmeventd.o \ -+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static dmeventd.o \ - -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS) - - ifeq ("@PKGCONFIG@", "yes") -diff --git a/make.tmpl.in b/make.tmpl.in -index 200ea2e05f..99f02e8b77 100644 ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -69,6 +69,7 @@ DEFS += @DEFS@ - # 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@ -diff --git a/tools/Makefile.in b/tools/Makefile.in -index ec546ca632..cdede2a058 100644 ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -137,7 +137,7 @@ man-generator: man-generator.o - - lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) - @echo " [CC] $@" -- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ -+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ $+ $(LVMLIBS) $(STATIC_LIBS) - - liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o --- -2.31.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch b/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch deleted file mode 100644 index 0b4a156c630f..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 88d5b3d711c8546864e57dbfba7591a19be80c4d Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Mon, 27 Dec 2021 00:53:21 +0100 -Subject: [PATCH] Don't use systemd-run in 69-dm-lvm.rules - -some people don't run systemd ---- - udev/69-dm-lvm.rules.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in -index 39e5b9807..6ba4efa0f 100644 ---- a/udev/69-dm-lvm.rules.in -+++ b/udev/69-dm-lvm.rules.in -@@ -62,8 +62,8 @@ ENV{SYSTEMD_READY}="1" - # LVM_VG_NAME_COMPLETE='foo' - # - # When the VG is complete it can be activated, so --# vgchange -aay <vgname> is run. It is run via --# systemd since it can take longer to run than -+# vgchange -aay <vgname> is run. It can take -+# longer to run than - # udev wants to block when processing rules. - # (if there are hundreds of LVs to activate, - # the vgchange can take many seconds.) -@@ -80,7 +80,7 @@ ENV{SYSTEMD_READY}="1" - # it's better suited to appearing in the journal. - - IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --udevoutput --journal=output $env{DEVNAME}" --ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run -r --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" -+ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" - GOTO="lvm_end" - - LABEL="lvm_end" --- -2.34.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch deleted file mode 100644 index 1b5524a61405..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/712336 -https://bugs.gentoo.org/549506 - -Adds fcntl.h into daemon-server.c to define fcntl and some constants. - ---- - libdaemon/server/daemon-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c -index 88905a7..771b021 100644 ---- a/libdaemon/server/daemon-server.c -+++ b/libdaemon/server/daemon-server.c -@@ -28,6 +28,7 @@ - #include <sys/un.h> - #include <unistd.h> - #include <signal.h> -+#include <fcntl.h> - - #include <syslog.h> /* FIXME. For the global closelog(). */ - --- -2.35.1 - diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch deleted file mode 100644 index af4cbc0d5aab..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://git.alpinelinux.org/aports/tree/main/lvm2/mallinfo.patch - -Patch from Alpine, disables _allocate_memory since mallinfo isn't defined in musl. -19:17 <@sam_> your caution is well-advised, but it should be safe enough given it's only affecting the non-glibc path - -Should be looked back to! - ---- ./lib/mm/memlock.c.orig 2015-03-09 11:18:41.560028850 -0100 -+++ ./lib/mm/memlock.c 2015-03-09 11:19:54.504373309 -0100 -@@ -137,7 +137,7 @@ - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/sys-fs/lvm2/lvm2-2.03.14-r5.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r5.ebuild deleted file mode 100644 index f07d1b50f8f3..000000000000 --- a/sys-fs/lvm2/lvm2-2.03.14-r5.ebuild +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -TMPFILES_OPTIONAL=1 -inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic - -DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" -HOMEPAGE="https://sourceware.org/lvm2/" -SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz - ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="readline static static-libs systemd lvm lvm2create-initrd sanlock selinux +udev thin" -REQUIRED_USE="!lvm? ( !lvm2create-initrd !sanlock !thin ) - static? ( !systemd !udev ) - static-libs? ( static !udev ) - systemd? ( udev )" - -DEPEND_COMMON=" - dev-libs/libaio[static-libs?] - static? ( dev-libs/libaio[static-libs] ) - !static? ( dev-libs/libaio[static-libs?] ) - readline? ( sys-libs/readline:0= ) - sanlock? ( sys-cluster/sanlock ) - systemd? ( >=sys-apps/systemd-205:0= ) - udev? ( >=virtual/libudev-208:= )" -# /run is now required for locking during early boot. /var cannot be assumed to -# be available -- thus, pull in recent enough baselayout for /run. -# This version of LVM is incompatible with cryptsetup <1.1.2. -RDEPEND="${DEPEND_COMMON} - >=sys-apps/baselayout-2.2 - >=sys-apps/util-linux-2.16 - lvm2create-initrd? ( sys-apps/makedev ) - lvm? ( virtual/tmpfiles ) - thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" -# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check -DEPEND="${DEPEND_COMMON} - static? ( - readline? ( sys-libs/readline[static-libs] ) - selinux? ( sys-libs/libselinux[static-libs] ) - >=sys-apps/util-linux-2.16[static-libs] - )" -BDEPEND=" - sys-devel/autoconf-archive - virtual/pkgconfig -" - -S="${WORKDIR}/${PN/lvm/LVM}.${PV}" - -PATCHES=( - # Gentoo specific modification(s): - "${FILESDIR}"/${PN}-2.03.06-example.conf.in.patch - - # For upstream -- review and forward: - "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch - "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 - "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 - "${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid - "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch - "${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450 - "${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756 - "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 - "${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch - "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652 - "${FILESDIR}"/${PN}-2.03.14-r1-add-fcntl.patch - "${FILESDIR}"/${PN}-2.03.14-r1-fopen-to-freopen.patch - "${FILESDIR}"/${PN}-2.03.14-r1-mallinfo.patch - "${FILESDIR}"/${PN}-2.03.14-freopen_n2.patch -) - -pkg_setup() { - local CONFIG_CHECK="~SYSVIPC" - - if use udev; then - local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - fi - fi - - check_extra_config - - # 1. Genkernel no longer copies /sbin/lvm blindly. - if use static; then - elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" - elog "their static versions. If you need the static binaries," - elog "you must append .static to the filename!" - fi -} - -src_prepare() { - default - - # Users without systemd get no auto-activation of any logical volume - if ! use systemd ; then - eapply "${FILESDIR}"/${PN}-2.03.14-dm_lvm_rules_no_systemd.patch - sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die - fi - - sed -i \ - -e "1iAR = $(tc-getAR)" \ - -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ - make.tmpl.in || die #444082 - - sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 - - sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 - - # Don't install thin man page when not requested - if ! use thin ; then - sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die - fi - - eautoreconf -} - -src_configure() { - filter-flags -flto - - # Workaround for bug #822210 - tc-ld-disable-gold - - local myeconfargs=() - - # Most of this package does weird stuff. - # The build options are tristate, and --without is NOT supported - # options: 'none', 'internal', 'shared' - myeconfargs+=( - $(use_enable lvm dmfilemapd) - $(use_enable lvm dmeventd) - $(use_enable lvm cmdlib) - $(use_enable lvm fsadm) - $(use_enable lvm lvmpolld) - $(usex !lvm --disable-udev-systemd-background-jobs '') - - # This only causes the .static versions to become available - $(usex static --enable-static_link '') - - # dmeventd requires mirrors to be internal, and snapshot available - # so we cannot disable them - --with-mirrors="$(usex !lvm none internal)" - --with-snapshots="$(usex !lvm none internal)" - - # disable O_DIRECT support on hppa, breaks pv detection (#99532) - $(usex hppa --disable-o_direct '') - ) - - if use thin; then - myeconfargs+=( --with-thin=internal --with-cache=internal ) - local texec - for texec in check dump repair restore; do - myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) - myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) - done - else - myeconfargs+=( --with-thin=none --with-cache=none ) - fi - - myeconfargs+=( - $(use_enable readline) - $(use_enable selinux) - --enable-pkgconfig - --with-confdir="${EPREFIX}"/etc - --exec-prefix="${EPREFIX}" - --sbindir="${EPREFIX}/sbin" - --with-staticdir="${EPREFIX}"/sbin - --libdir="${EPREFIX}/$(get_libdir)" - --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" - --with-default-dm-run-dir=/run - --with-default-run-dir=/run/lvm - --with-default-locking-dir=/run/lock/lvm - --with-default-pid-dir=/run - $(use_enable udev udev_rules) - $(use_enable udev udev_sync) - $(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d) - $(use_enable sanlock lvmlockd-sanlock) - $(use_enable systemd udev-systemd-background-jobs) - $(use_enable systemd notify-dbus) - $(use_enable systemd app-machineid) - $(use_enable systemd systemd-journal) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - CLDFLAGS="${LDFLAGS}" - ) - # Hard-wire this to bash as some shells (dash) don't know - # "-o pipefail" #682404 - CONFIG_SHELL="/bin/bash" \ - econf "${myeconfargs[@]}" -} - -src_compile() { - pushd include >/dev/null - emake V=1 - popd >/dev/null - - if use !lvm ; then - emake V=1 device-mapper - # https://bugs.gentoo.org/878131 - emake -C libdm/dm-tools V=1 device-mapper - else - emake V=1 - emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat - fi -} - -src_test() { - einfo "Tests are disabled because of device-node mucking, if you want to" - einfo "run tests, compile the package and see ${S}/tests" -} - -src_install() { - local inst - local INSTALL_TARGETS=( install install_tmpfiles_configuration ) - # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators ) - use !lvm && INSTALL_TARGETS=( install_device-mapper ) - emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" - - newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper - newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper - - if use lvm ; then - newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm - newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm - if ! use udev ; then - # We keep the variable but remove udev from it. - sed -r -i \ - -e '/^rc_need=/s/\<udev\>//g' \ - "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need" - fi - - newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring - newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld - fi - - if use sanlock; then - newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd - fi - - if use static-libs; then - dolib.a libdm/ioctl/libdevmapper.a - if use lvm; then - # depends on lvmetad - dolib.a libdaemon/client/libdaemonclient.a #462908 - # depends on dmeventd - dolib.a daemons/dmeventd/libdevmapper-event.a - fi - else - rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a - fi - - if use lvm2create-initrd; then - dosbin scripts/lvm2create_initrd/lvm2create_initrd - doman scripts/lvm2create_initrd/lvm2create_initrd.8 - newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd - fi - - insinto /etc - doins "${FILESDIR}"/dmtab - - dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf -} - -pkg_postinst() { - if use lvm; then - tmpfiles_process lvm2.conf - fi - - if use udev; then - udev_reload - fi - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - ewarn "Make sure the \"lvm\" init script is in the runlevels:" - ewarn "# rc-update add lvm boot" - ewarn - ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" - ewarn "to enable lvm autoactivation and metadata caching." - fi - - if use udev && [[ -d /run ]] ; then - local permission_run_expected="drwxr-xr-x" - local permission_run=$(stat -c "%A" /run) - if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then - ewarn "Found the following problematic permissions:" - ewarn "" - ewarn " ${permission_run} /run" - ewarn "" - ewarn "Expected:" - ewarn "" - ewarn " ${permission_run_expected} /run" - ewarn "" - ewarn "This is known to be causing problems for UDEV-enabled LVM services." - fi - fi -} - -pkg_postrm() { - if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then - udev_reload - fi -} |