From 5d0c0ffd63620a4db788484bd36ab92b76e7891b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Nov 2022 01:01:31 +0000 Subject: gentoo auto-resync : 20:11:2022 - 01:01:31 --- sys-fs/Manifest.gz | Bin 22187 -> 22190 bytes sys-fs/lvm2/Manifest | 7 + .../lvm2-2.03.17-dynamic-static-ldflags.patch | 50 ++++ .../lvm2/files/lvm2-2.03.17-example.conf.in.patch | 42 +++ sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch | 11 + .../files/lvm2-2.03.17-pthread-pkgconfig.patch | 31 +++ sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch | 56 ++++ sys-fs/lvm2/lvm2-2.03.17.ebuild | 303 +++++++++++++++++++++ 8 files changed, 500 insertions(+) create mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-dynamic-static-ldflags.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-pthread-pkgconfig.patch create mode 100644 sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch create mode 100644 sys-fs/lvm2/lvm2-2.03.17.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 747ccedaf2ea..a02e84037128 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 147610d5e83c..5c67f04cd397 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -25,11 +25,18 @@ AUX lvm2-2.03.14-static-pkgconfig-libs.patch 4600 BLAKE2B 18fb5d69fb77625189539a AUX lvm2-2.03.16-dm_lvm_rules_no_systemd.patch 780 BLAKE2B 8340f71fdf0c934dd8f6192628a58b9b2da5c27c5de48119dda7ce20c5ab9e4d3896e3412177f5e01a47a0db4bf58fc8fec5cfa7011690906bb749e989c268d4 SHA512 84f2612d17aa03ebbae55b7227a0ac934e94ad67341fee177ed3737c7a5e2e2a441773f4c3d7d8917c4a48bfac3ff385616c9eeaebfcca15d5c8d3fdb3b1899d AUX lvm2-2.03.16-musl-strerror_r.patch 1058 BLAKE2B b3e479d1b8370bad9221c638b75b8b8967cc5476ce40ca4eca29792b1633425f66ccaa51f59d2856774bcda8fce1195e7fb6f6c7a0e5a8d05ca94ab81b198992 SHA512 fef658c47f2e49e58daea768c86d41845a3f241702ebc97ab561e37f181f2ea5fbc92e1b62320d6e83d9b5e6b632326a319ca5521a890557b18a190a37d56c0f AUX lvm2-2.03.16-readelf.patch 921 BLAKE2B 2d7d6f69d40ded9825b11cae265b5afada6124fbe8826afb4cacaa2a49b999f60a2ddb39fc86e238cda3a4dfba739b92f5e0fbf79dc154a44ee6158f3c8ec268 SHA512 6e20b4e438cc08f4027878feb011fcfc4c78391eeda56d0e93d056736378c824f4220910be70b83e4b69cf517c58ef3b078892cb5a82110e9e16bc7d5c68131d +AUX lvm2-2.03.17-dynamic-static-ldflags.patch 1571 BLAKE2B be6ae0d42ab788beb7f0f1ebb94fd9d2ce5a404e500a83756b484194fea1fa3b592af2a09cb71dca70e67db3d412845a25113426e800f79fd509a30e4334c17f SHA512 766fdf36069bb40de480b2c1c1ee8e16c052830f07a87b017e5eb92eeac5cc4c37127d794be932c3e00a3e38a381cac56d9dfc7c21d89e357268d036ef15baae +AUX lvm2-2.03.17-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef +AUX lvm2-2.03.17-locale-muck.patch 398 BLAKE2B adb1c2bcd216acb413733d9f3f3618cad14019cf090bf2204d384b85fb37c6ce2a35bff2af3ab12dd977ce38c8485bf4c254973e2f0381f62462a28b30898a95 SHA512 8573bd1305061b2262b29096a7eb64871aa5179c6ca20689bb1a9078cc2245555fc35927a5696d8872141c78365c4f1a858672889595f333091aab353f498fb0 +AUX lvm2-2.03.17-pthread-pkgconfig.patch 732 BLAKE2B 1c179420d8cc3efaff24f03a5356469222da360c407445e30c51cde3d055de0245bd2387e934ca6bbd8518d6cc4110fccecbf430d3ba580159ac300c8570e34a SHA512 d0a800017c00cc954567900331436f9ddf30f48c7eb14d1c5e181ec9e8485702d76ebb5e981b519b97bc91ac2f5ff182e4e9ad04363c20f759b6f221c8911486 +AUX lvm2-2.03.17-readelf.patch 1804 BLAKE2B 559eea74823b3d333e68ac9fddd1046617148fbf525afa03b587d242065fc441b0447ea49479b62906c1111d5a9b0ef0e0150c1d24f7ef96bb64892544dff668 SHA512 f3fdb9b54c41354c7144795a357ba898c65540f09ef974d441ffd6d84d6725bbf9293fab048a3b1155b8961af140335c0023a9085a7a4717f070270491a62f17 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5 +DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9 EBUILD lvm2-2.03.14-r4.ebuild 9754 BLAKE2B fb0bc82154959383aebdb494229f521c39fdb1fcd9efd44ed43257456610cfe3cc1822878ff929eaacb4b5aea6f2fbb8acdb5c7a388066ec547933cc9d2e4fb0 SHA512 8a266fbee2cf9ee8e48be42a415483f37a4ea3959c7d6e8e7118d13ebc3f7dbb0d6858f3714f292947affa3a1914df08d22d58d637d87bd6b9943d27ff8fe593 EBUILD lvm2-2.03.16-r1.ebuild 9680 BLAKE2B 5205dad55e1b3c698c5c5df2e3180ccc6efd1f96d06999da9900cbed699287a65fc32140ff21c976acac39a49d347e8f1d10421a3dfbb977119ca3a898e6c7aa SHA512 38189585f7fb88bebfcfae78c098308c39c204db97c96894a1a62170de53229d865c8664b95cfe1dbf89b84aee083072d845fcfff259f6cbfb65d2e8e507809b EBUILD lvm2-2.03.16-r2.ebuild 9860 BLAKE2B 7dd9c19c1e9e353a0f47b5726c4204171dd8db5bb4d36d860abe52f9ff5eb42302a995365365827d716d9fee05d04a8636727149cadd8fde4914f4c3e0cb653a SHA512 fa88f913cee5c2c31ddfe409bdb7eb27775b5e7744e0804bb5dcf8ca5487083041a9d8163e2b788751a8654fb1caab454c9a33a34cb24bc7a5a89dccad8ce370 +EBUILD lvm2-2.03.17.ebuild 9363 BLAKE2B e92decb208c5acaf53b890e8582b55b61333e8f18a499c30f44fdd5ca3aae3fabd6ad0ae484f2ccecf87a36aa5049f7673e0835ddb4ee3b67b53ba65be7fb5b0 SHA512 4f003ebb3425c79d0875e4681ab9e58599aaa4da7b22b0432728c73fbc03e10d378bb21d2ef5872eb356224af870b670b8b7eb6b973022a6469740320f817d37 MISC metadata.xml 939 BLAKE2B a3f004d1454fd139e640d70d7e53b472faa4f70f1b7b7b015a85ddd15766746ed89d0691ab8988b826d50d384d9be689dc5c2162358255c86fe24056c06acd55 SHA512 4bbc76d6ab664633ad7306965a430ae7071f3822e5dcc55d102ab19f2a853ead2c33144372892e38c51c264ca3e2ff7bcf4765105a7e7960fb5c835879e81621 diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.03.17-dynamic-static-ldflags.patch new file mode 100644 index 000000000000..e3228945a325 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.17-dynamic-static-ldflags.patch @@ -0,0 +1,50 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -32,6 +32,7 @@ + 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" +@@ -1945,6 +1946,7 @@ + AC_SUBST(SYSCONFDIR) + AC_SUBST(SNAPSHOTS) + AC_SUBST(STATICDIR) ++AC_SUBST(STATIC_LDFLAGS) + AC_SUBST(STATIC_LINK) + AC_SUBST(TESTSUITE_DATA) + AC_SUBST(THIN) +--- a/daemons/dmeventd/Makefile.in ++++ b/daemons/dmeventd/Makefile.in +@@ -76,7 +76,7 @@ + + 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") +--- a/make.tmpl.in ++++ b/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@ +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -137,7 +137,7 @@ + + 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 diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch new file mode 100644 index 000000000000..b63b681e5fab --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch @@ -0,0 +1,42 @@ +Add Gentoo specific changes + +--- a/conf/example.conf.in ++++ b/conf/example.conf.in +@@ -170,6 +170,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: +@@ -1843,7 +1846,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. +@@ -1888,7 +1891,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. +@@ -1931,7 +1935,7 @@ + # This configuration option is advanced. + # This configuration option has an automatic default value. + # stripesize = 64 +-# } ++} + + # Configuration section report. + # LVM report command output formatting. diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch new file mode 100644 index 000000000000..c672a10e2cf6 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch @@ -0,0 +1,11 @@ +--- a/make.tmpl.in ++++ b/make.tmpl.in +@@ -571,7 +571,7 @@ + ( cat $(srcdir)/.exported_symbols; \ + if test -n "$(EXPORTED_HEADER)"; 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.17-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.03.17-pthread-pkgconfig.patch new file mode 100644 index 000000000000..828cf66667b1 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.17-pthread-pkgconfig.patch @@ -0,0 +1,31 @@ +Add pthread to libdevmapper pkgconfig file + +--- a/libdm/libdevmapper.pc.in ++++ b/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@ +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -89,6 +89,7 @@ + TARGETS += lvm.static + INSTALL_LVM_TARGETS += install_tools_static + INSTALL_CMDLIB_TARGETS += install_cmdlib_static ++ STATIC_LIBS += @PTHREAD_LIBS@ + endif + + LIB_VERSION = $(LIB_VERSION_LVM) +@@ -114,6 +115,10 @@ + + include $(top_builddir)/make.tmpl + ++ifeq ("@STATIC_LINK@", "yes") ++ STATIC_LIBS += @PTHREAD_LIBS@ ++endif ++ + device-mapper: + + all: device-mapper diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch b/sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch new file mode 100644 index 000000000000..82870b108e09 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.17-readelf.patch @@ -0,0 +1,56 @@ +From 2de7e5c222ff114f41dadcf904061d6c2a77eae2 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sat, 19 Nov 2022 17:05:31 +0100 +Subject: [PATCH 1/2] Allow for overriding of `readelf` + +* This allows users to use e.g. `llvm-readelf` on systems with binutils as default. + +Bug: https://bugs.gentoo.org/840628 +--- + configure.ac | 1 + + libdm/Makefile.in | 4 ++-- + libdm/make.tmpl.in | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 704772b62..f39c87d08 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,6 +83,7 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_MKDIR_P + AC_PROG_RANLIB ++AC_CHECK_TOOL([READELF], [readelf]) + AC_CHECK_TOOL(AR, ar) + AC_PATH_TOOL(CFLOW_CMD, cflow) + AC_PATH_TOOL(CSCOPE_CMD, cscope) +diff --git a/libdm/Makefile.in b/libdm/Makefile.in +index 35115d7f0..2758648e6 100644 +--- a/libdm/Makefile.in ++++ b/libdm/Makefile.in +@@ -71,8 +71,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION): $(LIB_SHAR + # also the older symbol is built-in + .symver_check: $(LIB_SHARED) + @echo " [CHECK] $<" +- $(Q) if readelf -Ws $< | grep -q dm_stats_create_region@@; then \ +- SYM=$$(readelf -Ws $< | grep dm_stats_create_region@DM_1_02_106); \ ++ $(Q) if $(READELF) -Ws $< | grep -q dm_stats_create_region@@; then \ ++ SYM=$$($(READELF) -Ws $< | grep dm_stats_create_region@DM_1_02_106); \ + if test -n "$$SYM"; then touch $@; \ + else echo >&2 "Missing versioned symbols in $<"; false; fi; \ + else touch $@; fi +diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in +index f1c88fac0..095fb028a 100644 +--- a/libdm/make.tmpl.in ++++ b/libdm/make.tmpl.in +@@ -34,6 +34,7 @@ ifeq ($(CC), cc) + endif + + RANLIB = @RANLIB@ ++READELF = @READELF@ + INSTALL = @INSTALL@ + MKDIR_P = @MKDIR_P@ + MSGFMT = @MSGFMT@ +-- +2.38.1 + diff --git a/sys-fs/lvm2/lvm2-2.03.17.ebuild b/sys-fs/lvm2/lvm2-2.03.17.ebuild new file mode 100644 index 000000000000..01f3f1dd4f90 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.03.17.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz" +S="${WORKDIR}/${PN^^}.${PV}" + +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="+lvm lvm2create-initrd readline sanlock selinux static static-libs systemd +thin +udev" +REQUIRED_USE=" + static? ( !systemd !udev ) + static-libs? ( static !udev ) + systemd? ( udev ) + thin? ( lvm )" + +DEPEND_COMMON=" + udev? ( virtual/libudev:= ) + lvm? ( + dev-libs/libaio + sys-apps/util-linux + readline? ( sys-libs/readline:= ) + sanlock? ( sys-cluster/sanlock ) + systemd? ( sys-apps/systemd:= ) + )" +# /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 + lvm? ( + virtual/tmpfiles + lvm2create-initrd? ( sys-apps/makedev ) + thin? ( sys-block/thin-provisioning-tools ) + )" +# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check +DEPEND="${DEPEND_COMMON} + static? ( + lvm? ( + dev-libs/libaio[static-libs] + sys-apps/util-linux[static-libs] + readline? ( sys-libs/readline[static-libs] ) + ) + selinux? ( sys-libs/libselinux[static-libs] ) + )" +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig" + +PATCHES=( + # Gentoo specific modification(s): + "${FILESDIR}"/${PN}-2.03.17-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.03.17-locale-muck.patch #330373 + "${FILESDIR}"/${PN}-2.03.17-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.17-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.03.14-r1-fopen-to-freopen.patch + "${FILESDIR}"/${PN}-2.03.14-freopen_n2.patch + "${FILESDIR}"/${PN}-2.03.16-musl-strerror_r.patch + "${FILESDIR}"/${PN}-2.03.17-readelf.patch +) + +QA_CONFIGURE_OPTIONS="--disable-static" + +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.16-dm_lvm_rules_no_systemd.patch + fi + + sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 + + eautoreconf +} + +src_configure() { + filter-flags -flto + + # Workaround for bug #822210 + tc-ld-disable-gold + + # Most of this package does weird stuff. + # The build options are tristate, and --without is NOT supported + # options: 'none', 'internal', 'shared' + local myeconfargs=( + $(use_enable lvm dmfilemapd) + $(use_enable lvm dmeventd) + $(use_enable lvm cmdlib) + $(use_enable lvm fsadm) + $(use_enable lvm lvmpolld) + $(usev !lvm --disable-udev-systemd-background-jobs) + + # This only causes the .static versions to become available + $(usev static --enable-static_link) + + # dmeventd requires mirrors to be internal, and snapshot available + # so we cannot disable them + --with-mirrors="$(usex lvm internal none)" + --with-snapshots="$(usex lvm internal none)" + + # disable O_DIRECT support on hppa, breaks pv detection (#99532) + $(usev hppa --disable-o_direct) + ) + + if use lvm && 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+=( + # musl doesn't do symbol versioning so can end up with + # runtime breakage. + --with-symvers=$(usex elibc_glibc 'gnu' 'no') + $(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=sanlock requires USE=lvm + $(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock) + $(use_enable systemd udev-systemd-background-jobs) + $(use_enable systemd notify-dbus) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + CLDFLAGS="${LDFLAGS}" + ) + + # Hard-wire this to bash as some shells (dash) don't know + # "-o pipefail" #682404 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 -C include + + if use lvm ; then + emake V=1 + emake V=1 CC="$(tc-getCC)" -C scripts + else + emake V=1 device-mapper + # https://bugs.gentoo.org/878131 + emake V=1 -C libdm/dm-tools device-mapper + 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 INSTALL_TARGETS=( + # full LVM2 + $(usev lvm "install install_tmpfiles_configuration") + # install systemd related files only when requested, bug #522430 + $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators") + + # install dm unconditionally + 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/\//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 + + 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 + + if use sanlock; then + newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd + fi + 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 || die + fi + + insinto /etc + doins "${FILESDIR}"/dmtab + + dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf +} + +pkg_postinst() { + use lvm && tmpfiles_process lvm2.conf + + 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 +} -- cgit v1.2.3