diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2014-07-16 00:28:33 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-07-16 00:28:33 +0000 |
commit | 2e0e4341f9df16400e2e21ac81d20e0e9f5b1076 (patch) | |
tree | 0c64250cd446e7b72b161888452321c0daff0358 /sys-fs/lvm2 | |
parent | Automated update. (diff) | |
download | historical-2e0e4341f9df16400e2e21ac81d20e0e9f5b1076.tar.gz historical-2e0e4341f9df16400e2e21ac81d20e0e9f5b1076.tar.bz2 historical-2e0e4341f9df16400e2e21ac81d20e0e9f5b1076.zip |
Bump per bug #516604.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r-- | sys-fs/lvm2/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/lvm2/Manifest | 19 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch | 104 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.02.107.ebuild | 261 |
4 files changed, 376 insertions, 16 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index 2342a3bd7504..0d493711a06c 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/lvm2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.354 2014/06/20 16:55:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.355 2014/07/16 00:28:28 robbat2 Exp $ + +*lvm2-2.02.107 (16 Jul 2014) + + 16 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> + +files/lvm2-2.02.107-static-pkgconfig-libs.patch, +lvm2-2.02.107.ebuild: + Bump per bug #516604. 20 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.106.ebuild: Always pass --disable-udev-systemd-background-jobs with USE="device-mapper- diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 210683df79b2..fd6e1a82bc90 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX clvmd.confd-2.02.39 213 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a SHA512 9614c4188c9a5bcf398d1f521b52d7e2281fcdf76265fdaca4acda22be282d8468e82b54a2661d5753f4b9a442ebe93a60daf87c846db4e275a283f71c9fd8e2 WHIRLPOOL b429d06a5200d37f46e72190060bc2fe866575ba441b5f92d12d939bdc5d411ef37e895a7369bbaaf733b1a0d0305a05d499c7ae6c7360fe8767e902d2a3bfc4 AUX clvmd.rc-2.02.39 3684 SHA256 476289b24539eeff4ff94c34c129da755d8cff11f1e950b40f9fad212ca5c05d SHA512 18879fa7925d6181b9ebfd7a6379ee4f25c9c83474ba69684e63811867754b1c52dd6568324aafd9fe391fd2fd4aadf931870cefc21b72d2f81f9e04ef123f41 WHIRLPOOL 095a313a6c66f0dec1d42233dd1853879ade6334c474ac747c2cd87c24b433381547a6fdecedf784db060549ece8dc24870d4981bcf590bf39e57dd7bad92120 AUX device-mapper.conf-1.02.22-r3 15 SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22 SHA512 1846e0ca1be7170d4c0beb694a23aea4d19b24b99a248bb0f4e034286a6beede0a8efc474b0c237e33ee72c86c93b6238f2d5ea23e224765acba99c90633261e WHIRLPOOL a0de185e849cd4d1aab9f145a6330f267ca547ba4ec7720be6f33e2c3c4c182b8674ea220b894f0fc806fe6637ba7bcabd739ca57b53b3efa5fad0cf1e57ba2e @@ -20,6 +17,7 @@ AUX lvm2-2.02.105-readline-6.3.patch 1606 SHA256 0c599fc01ac3a83a0cf16ebbe110854 AUX lvm2-2.02.105-static-pkgconfig-libs.patch 3382 SHA256 cc3cbe1b1511eac87a4915f18206d045f6192d9815580088bacf760ffee06c4d SHA512 3b2bd8b991c380dee73f848a794fb1c53ef601fbaea85185d2494040c6e70519727211cb3adffb36bb115c0eb774d4e4c1298b7d151b21d25924b492ed51034b WHIRLPOOL d4a8d9448e80148f321d46c55daa662735c9b9d9cb758b944eea8a213e60d270676bed610e9ec22dc970b38424465c12d840aeb9c7bc585b8cc07210cc365828 AUX lvm2-2.02.106-pthread-pkgconfig.patch 615 SHA256 a33febfc3afbaaea1806afd252c28e48c7359f6136a1353103ac94d7a681fd71 SHA512 44db7e1c2b19d458d6e71519b1a3b878c20265e0527fb5edbf3874ed1c529383b888568af10e6a2099c3cf683384cc106aef0c392fd60d48a18af8cee89f360c WHIRLPOOL 544c51e7a305400a41869447e0e9bfd015f5a64437acc143ceb1dffd98a05846fdd31f07d0f56028fb6867e34237a487ace16e6afa692e3126e3353ce1e34f10 AUX lvm2-2.02.106-static-pkgconfig-libs.patch 3151 SHA256 5215599d8b83e3a73782255747e8fb98faacd6c6606836b4f2ea5ccfd1e98066 SHA512 a00c03a3deae2898f5f3692aa797834601066fa1b444d0606a08e6ed6cfb57e41843da9bda41d2489bf206c6a13149e90d199e75a97ecfa5a05f612a770f4c7a WHIRLPOOL 315daddcd1135d68c0bf433ea913741985d3af1784d2658df02c7c46c5e452c18a6069dfc0ee2261231eedbdca2dde9f2c468bbf177a2135080be058b074e6ae +AUX lvm2-2.02.107-static-pkgconfig-libs.patch 3607 SHA256 b3efe76e670fd45e363c62bc8a9965eff4bb1c12e98b6eebdf3b8690de24ddca SHA512 6cd6bbe2ff2dbbe012c20043f3b31e42cacc3379838358c58891ec8ce9593ced29a14fbb9e96b9c76e1b245c5aec2e38a26d3a599c78ff18c3d920e89f1d2f72 WHIRLPOOL 4acf0777694df20886b4e6bf06c91a86041f6e4d888c49dc26f582cd6220504550f54ea5d94c220a3a16b4768933e45e901f274dfaf616083db741aab81b612b AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 SHA256 b892d0544e05350e78ea400c16e6fd3657671d9bdf50bfae70505fd79bdda081 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de WHIRLPOOL cb533df528be0aae4bf50966285ef7a238f810d955ee86d5b446f43944d093732eff6ef8178d1654c4a2c075049ffc11994a99de6291bab1140cb8812be8b8a0 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 SHA256 1c498b5efce77ed16bbbfcd9e0ec6da404a9c70c7ad0959ed7b60733adfcfc21 SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c WHIRLPOOL f273c893acedfd658e7947abb5f4b528f15de9808ae3862ec8a9189ba7de4ea6998dc67dbc7af642ca3a27bba2ef8eabfd48337f532145f88500988f564313b1 AUX lvm2-2.02.67-createinitrd.patch 660 SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 WHIRLPOOL b358a31a9ee669a4fccf42280da5342c214932bfd83deee92d41351eb37dc6c0b2e5dc7419f2304128b5d285fed92db5b2e1634a71bbf1310d36b54d1a353bb0 @@ -32,19 +30,10 @@ AUX lvmetad.initd-2.02.105-r2 405 SHA256 60accb4b6114753232f2db0adf3fc3f46d4459b DIST LVM2.2.02.103.tgz 1343887 SHA256 71c5a2e8842ed2f13f52e02b44eb183110a3410dedd1e117348e4eecc29d3c2a SHA512 1a9920947312e3e248bff7ff5d5eb54dec3f3b05eb3388fa92f95369b26ae8e6838186f87d817b09e8c635ddc3cdf51bc1d07c2a9d65fd7eab33598998bb7afe WHIRLPOOL de96dd8b7fb46ec777f34169759852ee5ef03ccdc93e110bf63c92dddb9cf4f805635444ceeead6b581610d2a23217d3b4729c286f016623f73b99c0b35a42a0 DIST LVM2.2.02.105.tgz 1374752 SHA256 d0700c7000ff6375c1c36cb2a89b97b9ae6757f4219fa9ec65f313d13d71e51e SHA512 fb2f4eaceb8e643c7e081b6d8d77daf387960c39f880f5600df40c7eb32d7908835114b8619805a814fc1c59ce920fa36d9afa72314dfabcb69ddf134833e1fa WHIRLPOOL b0dfea302e0afced489d96d14a04bddc48cfff540d26f69217787fe95b571d5600647162da84a95c6cb42e02fb83473a00257ab73e920b9a1b3c46f5ab12f02d DIST LVM2.2.02.106.tgz 1426030 SHA256 6c83df279c2190543be750cda278c7d3e875dcadb5cbdc44c19f6040d718285b SHA512 52cfbe86ec89cebc639c6446195bba546fc5576165a38c5db6adf0d8aba6309a3140562d9c6a8bdc4ba415d91bb307989cdbb787cf4ec68dcacdcccbda71ae07 WHIRLPOOL 5853cd3e64ede16e21ee66a664cae222f707406e85379e051e72bf9264c8b6da83af9be7634d8d93c07bd772c395dc278ff37b55adc40f50b6e4c432e8e7a593 +DIST LVM2.2.02.107.tgz 1462424 SHA256 b1d6890e7a23c7a0bb7ed6be7f17a5e8f819da71d93f4a0b123661fe0f028820 SHA512 896c0f34d0134dfd985345e42e1381865e27ebdb7fa33b1e4ccf0b4dbd00bc708931f6827756778567092376ecb7f77bade7f93461a61b5e1e6b15c40b575bdd WHIRLPOOL c85c82e875c52a297cb8fd02eb7942906fee369506e5c51888a06c8c29361f5db2b59161d36ea085326fd83dc6371d6573bf298bd2d21c3aecacfcab674ebf6e EBUILD lvm2-2.02.103.ebuild 7433 SHA256 3ae965eab7c06b32ea1ec3718d4e866b9a53582959957d2e6afdadceb1c68847 SHA512 13c4c12b44bb2a9f46fc12afa5978e15ef31e90be18d917c86189cf02eba3edb6f5e7390cfd38c0d1716ccacdc18582c826b8933f3ecccba1d11cbbbb536d4d8 WHIRLPOOL b88350388468f6a00924e1b0ef2d99eb1b55a763a0951c8b51de621519cffe11ad53b18cc49a02cd8122caf9e4dd97f49b9aae1ac1dbb1c925cac63e82e5927a EBUILD lvm2-2.02.105-r2.ebuild 8540 SHA256 c3d234e184cc6707196343a3215efa289847dd03f35933b3e580b0ab0109a6d6 SHA512 c8a60e153a7f46627c803e8a183defae047c67f66f40578e95a7fe4b5a6830e2167d7081595e5d3f3e6dd55f13c00e7e772713b0e708ec6f32da97ae8ce08337 WHIRLPOOL 16fd1fb43174259cdf7ce9c99711bf2e19d5d726af79762d37f0ce47e92489174a8d2c4519ad40d9f4f184d51bbdd353082bcfe6f93bf9ff7e1f5b1d6ff872ab EBUILD lvm2-2.02.106.ebuild 8865 SHA256 0019f62c2ababadf481a29160134f001ac391da5751349d4fab76122f1341b3d SHA512 12e2bb2f324d8f885441f12c011e10d5a7fb6fe28c2b66c4ad66c5f8a836faae6ae34d522c81cb77afdf7807e57dbd91d2c13fe585cd4e2bff4857c8a86db891 WHIRLPOOL 22a4a20cf7fa1737c7fec5a1e513f01099352f350f1f8a4c95fa42908ff0e4ecb41b0cb94bd02da9a9d7fc45e8e57da3ac87910e0d8a006ead447ba1b044b7c5 -MISC ChangeLog 68244 SHA256 d672e9eb972f72b1484859b19e9980a9cd886cc9d6f1cde978faf4fa7a360e5f SHA512 c66316ef849e663a316282362c1c4e7d6354dbbc76da694096fddb1eb58582e8ce9f83226f6013ea3d01b54c79a6700e145ab2034499c033b723b97cd8282f67 WHIRLPOOL 08368dca85ee9f6ebb6f965a7ae7522f704450195e25eb09774f9586585264df2ae46400ae9cbf121b8bf0ba37c7565ad1006341be90ea2bdf7f8a8b158fcbd8 +EBUILD lvm2-2.02.107.ebuild 8863 SHA256 e44b3e7bca76f011293996b870ceca6083a5273d7098e3914f7969ad2f556179 SHA512 ea66057e1d1469852c7eb1a871f74ed0ee986e2b8a751c18254ac4bedd7e421b25ba9b14cd01442ac8f4b958f592a9d4cbfa4414807c7f1c5558263a21f4306b WHIRLPOOL e4fea0962a40883d63369127e4a91b6f7db459b2614f54ed78d063a98046ed2a25d1081498c71f8fb69536c2f65742a4213ccd59f06e3772a075c06fba596912 +MISC ChangeLog 68425 SHA256 9842f15ea4696d2aaf3434d7f6bee1252b818c592b919d26b979075098b1790a SHA512 4f3ed272214a47af7377c890116fd7daa11f932f4e29fadf6044d88c4f0b7d29647cb6a32043b3f6c4f7fd4bb6c5622b915dd4f3eae7c64735384bea5b58e4ef WHIRLPOOL bdeb973f4f87086cc2a66a41d1ead1d3c9390fa6635c2942fb07fb5a4bca6f46cac337464d8ee295abd0e6ff7241025fd19836384dcf3edcbf9f47798bed9965 MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQEcBAEBCAAGBQJTpGbEAAoJEEdUh39IaPFNQUcIAI1uTkQBHooWkLpYtZ7lSFqZ -BD8UgIT08V1CZe6da3C/nHgAfv5O/RnFd3BuGTpbmKsjJlo1E8XsDDcjquoXr/4t -LItU9RT9M5Fate3qNxvCe68Yc1ySAwVtbZcAkWMzjjTTILyhhLgV4xVfqMW73DUG -w1Y/szjwv+vx2ZfIC5QFOeQbCD0S/woOZcGNWUmJs4NGp8Dy3+HfULpt3bRnDa5c -32u77GRxyZBQTfLBhV9rALUPD0ob0xTKcMxxXv0ZqY4cmNMwLuaVIK0k+5zbBqhR -KFalY/YJCCW1aRM3LAEhP8TUF5W47fUAFARrvlsfoTgiO6XAo0beAnItoqLZN3Y= -=95MB ------END PGP SIGNATURE----- diff --git a/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch new file mode 100644 index 000000000000..723cd0e276e2 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch @@ -0,0 +1,104 @@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/configure.in LVM2.2.02.107/configure.in +--- LVM2.2.02.107.orig/configure.in 2014-07-15 12:57:55.867439868 -0700 ++++ LVM2.2.02.107/configure.in 2014-07-15 17:24:02.662666091 -0700 +@@ -997,6 +997,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 +@@ -1022,6 +1023,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 + +@@ -1242,19 +1244,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 + + ################################################################################ +@@ -1556,6 +1571,7 @@ + ################################################################################ + AC_SUBST(APPLIB) + AC_SUBST(AWK) ++AC_SUBST(BLKID_STATIC_LIBS) + AC_SUBST(BLKID_PC) + AC_SUBST(BLKID_WIPING) + AC_SUBST(BUILD_CMIRRORD) +@@ -1651,6 +1667,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) +@@ -1662,6 +1679,7 @@ + AC_SUBST(THIN_DUMP_CMD) + AC_SUBST(THIN_REPAIR_CMD) + AC_SUBST(THIN_RESTORE_CMD) ++AC_SUBST(UDEV_STATIC_LIBS) + AC_SUBST(UDEV_PC) + AC_SUBST(UDEV_RULES) + AC_SUBST(UDEV_SYNC) +diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/make.tmpl.in LVM2.2.02.107/make.tmpl.in +--- LVM2.2.02.107.orig/make.tmpl.in 2014-07-15 12:57:55.868439884 -0700 ++++ LVM2.2.02.107/make.tmpl.in 2014-07-15 17:23:24.060055838 -0700 +@@ -44,7 +44,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@ +@@ -59,10 +59,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/lvm2-2.02.107.ebuild b/sys-fs/lvm2/lvm2-2.02.107.ebuild new file mode 100644 index 000000000000..4dedb969556a --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.107.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.107.ebuild,v 1.1 2014/07/16 00:28:28 robbat2 Exp $ + +EAPI=5 +inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic + +DESCRIPTION="User-land utilities for LVM2 (device-mapper) software." +HOMEPAGE="http://sources.redhat.com/lvm2/" +SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz + ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" +REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )" + +DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) + readline? ( sys-libs/readline ) + udev? ( >=virtual/udev-200[static-libs?] )" +# /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/openrc-0.11 + !<sys-fs/cryptsetup-1.1.2 + !!sys-fs/clvm + !!sys-fs/lvm-user + >=sys-apps/util-linux-2.16 + lvm2create_initrd? ( sys-apps/makedev ) + 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} + virtual/pkgconfig + >=sys-devel/binutils-2.20.1-r1 + static? ( + selinux? ( sys-libs/libselinux[static-libs] ) + udev? ( virtual/udev[static-libs] ) + >=sys-apps/util-linux-2.16[static-libs] + )" + +S=${WORKDIR}/${PN/lvm/LVM}.${PV} + +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() { + # Gentoo specific modification(s): + epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch + + 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{.in,} || die #480212 + + # For upstream -- review and forward: + epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch + epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch + epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 + epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 + epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed + epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 + epatch "${FILESDIR}"/${PN}-2.02.107-static-pkgconfig-libs.patch #370217, #439414 + blkid + epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 + # Upstream never tested with USE="-thin" wrt #510202 + sed -i -e 's|_man7: $(MAN8)|_man7: $(MAN7)|' man/Makefile.in || die + use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } + + eautoreconf +} + +src_configure() { + filter-flags -flto + local myconf + local buildmode + + myconf="${myconf} $(use_enable !device-mapper-only dmeventd)" + myconf="${myconf} $(use_enable !device-mapper-only cmdlib)" + myconf="${myconf} $(use_enable !device-mapper-only applib)" + myconf="${myconf} $(use_enable !device-mapper-only fsadm)" + myconf="${myconf} $(use_enable !device-mapper-only lvmetad)" + use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs" + + # Most of this package does weird stuff. + # The build options are tristate, and --without is NOT supported + # options: 'none', 'internal', 'shared' + if use static; then + buildmode="internal" + # This only causes the .static versions to become available + myconf="${myconf} --enable-static_link" + else + buildmode="shared" + fi + dmbuildmode=$(use !device-mapper-only && echo internal || echo none) + + # dmeventd requires mirrors to be internal, and snapshot available + # so we cannot disable them + myconf="${myconf} --with-mirrors=${dmbuildmode}" + myconf="${myconf} --with-snapshots=${dmbuildmode}" + if use thin; then + myconf="${myconf} --with-thin=internal" + myconf="${myconf} --with-thin-check=${EPREFIX}/sbin/thin_check" + myconf="${myconf} --with-thin-dump=${EPREFIX}/sbin/thin_dump" + myconf="${myconf} --with-thin-repair=${EPREFIX}/sbin/thin_repair" + else + myconf="${myconf} --with-thin=none" + fi + + if use lvm1; then + myconf="${myconf} --with-lvm1=${buildmode}" + else + myconf="${myconf} --with-lvm1=none" + fi + + # disable O_DIRECT support on hppa, breaks pv detection (#99532) + use hppa && myconf="${myconf} --disable-o_direct" + + if use clvm; then + myconf="${myconf} --with-cluster=${buildmode}" + # 4-state! Make sure we get it right, per bug 210879 + # Valid options are: none, cman, gulm, all + # + # 2009/02: + # gulm is removed now, now dual-state: + # cman, none + # all still exists, but is not needed + # + # 2009/07: + # TODO: add corosync and re-enable ALL + local clvmd="" + use cman && clvmd="cman" + #clvmd="${clvmd/cmangulm/all}" + [ -z "${clvmd}" ] && clvmd="none" + myconf="${myconf} --with-clvmd=${clvmd}" + myconf="${myconf} --with-pool=${buildmode}" + else + myconf="${myconf} --with-clvmd=none --with-cluster=none" + fi + + myconf="${myconf} --with-cache=${buildmode}" + + econf \ + $(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 "$(get_udevdir)"/rules.d) \ + $(use_enable systemd udev-systemd-background-jobs) \ + "$(systemd_with_unitdir)" \ + ${myconf} \ + CLDFLAGS="${LDFLAGS}" +} + +src_compile() { + pushd include >/dev/null + emake + popd >/dev/null + + if use device-mapper-only ; then + emake device-mapper + else + emake + emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat + fi +} + +src_install() { + local inst + INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration" + use device-mapper-only && INSTALL_TARGETS="install_device-mapper" + for inst in ${INSTALL_TARGETS}; do + emake DESTDIR="${D}" ${inst} + done + + newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper + newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper + + if use !device-mapper-only ; then + newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd + newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm + newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm + + newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring + newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad + fi + + if use clvm; then + newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd + newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd + fi + + if use static-libs; then + dolib.a libdm/ioctl/libdevmapper.a + dolib.a libdaemon/client/libdaemonclient.a #462908 + #gen_usr_ldscript libdevmapper.so + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + 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() { + 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." +} + +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" +} |