| 1 |
commit: 5f6fec97e1b893a8900a104a1c80b14f0aa18a1f |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Feb 14 00:21:35 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Feb 14 00:21:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5f6fec97 |
| 7 |
|
| 8 |
sys-fs/lvm2: version bump to 2.02.166-r1 |
| 9 |
|
| 10 |
sys-fs/lvm2/Manifest | 7 ++++--- |
| 11 |
.../files/{lvm.rc-2.02.116-r6 => lvm.rc-2.02.166-r1} | 4 +++- |
| 12 |
sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 | 18 ++++++++++++++++++ |
| 13 |
.../{lvm2-2.02.166.ebuild => lvm2-2.02.166-r1.ebuild} | 17 ++++++++++++----- |
| 14 |
sys-fs/lvm2/metadata.xml | 1 + |
| 15 |
5 files changed, 38 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest |
| 18 |
index 34abb31..2801e9a 100644 |
| 19 |
--- a/sys-fs/lvm2/Manifest |
| 20 |
+++ b/sys-fs/lvm2/Manifest |
| 21 |
@@ -8,7 +8,7 @@ AUX lvm-monitoring.initd-2.02.105-r2 970 SHA256 3f2577f224a8f1594255c32e38aecdf3 |
| 22 |
AUX lvm.confd-2.02.28-r2 173 SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844 SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0 WHIRLPOOL 06467b28ad2acf36984eef1b7b7e3d88277505760f848a808d85820cd1cccf6bb7397c00624d36961d9bdbb994e55de03444a7cfc97ecefd9bd3b785a3c6fdbf |
| 23 |
AUX lvm.rc-2.02.105-r2 2967 SHA256 9750556b8d018f959d44f3361c3e7ca79147fce02dec38bd8137b08d8a8df1b1 SHA512 9c4e1abc85c96148b46d278668225369af5e8d1cb9b47b6de46baae51ffcfbd9c5dee49c285cf936e02ed6fda366ae866a60a2d9023b26842caa485a3bec92d3 WHIRLPOOL 5144ab76632702faefffa1bdda968da379b07e9f371874076461b500922bc5bbcfd6895adb7919e2ba4c54c694b3f23c8a92abe4350039ca3d7da7cc7a0a2a4b |
| 24 |
AUX lvm.rc-2.02.116-r4 3778 SHA256 9f768b7aa564f151241134b8c15f95f31038a3bfc3122b2a9dae25fa82cc053a SHA512 7ca6e1b25629145fc0bb33b5bf5fedcb30f4e69ae6401222488307d29d86abe3c3cae3c60a2cc4c53082b6fe28027e447ee01bc3ae8c2b3bf811a75678d80b7c WHIRLPOOL a6672253ebb94bd5b46c1fac3af0f985c765561e075526ead8b00c19907af77ce330c7a981f0d153a2fbe6798bcfb63e27e20a0d4fc18d68c03a9c63e384f5fb |
| 25 |
-AUX lvm.rc-2.02.116-r6 3790 SHA256 5a790c590b09791f1803426d3f208b234b2513626560724e25caf089eb611753 SHA512 f31d292c19ea56161803237ae08948c3cabaa5276658615420359c30cb51e0257d26a183d860d4152edab6c80bcd3a7e810102b1162e330711a0ffea92257bc2 WHIRLPOOL fc2191bae785465285ec83828ee64710a05a3f5e425ed49b6ecc92c8cf0266b55f544a06a1eddb1ccde09eca10660a3f3205e0836efd87c421f43774c4f0cf58 |
| 26 |
+AUX lvm.rc-2.02.166-r1 3896 SHA256 b94fd23ee624e5d881f08461768e378e7e30ab5cbe38a94275bdf930f1ecc536 SHA512 d585b1e0d32c1d2f011f57fcfda8066a99de83a3723f4ddc0d562fb3200ab506582004564f3b203fe9b7d846871088caad8ca49ecf59eb9e3e4bdc1570bd39ca WHIRLPOOL 5326f0697b8b47bf410f2d672d30d814bd772f904c8121462b169c63c6fc8f0aa740c418244b88862859495cbe65cfcc565bb29b1e24c19664071f1bfb66c985 |
| 27 |
AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 SHA256 aaf04bdb140cbedebe731a04846cbb7459cdd002ee4616a3d0725136edb5ef02 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223 WHIRLPOOL 9e822f0f1c7c67b5443fb9e62547a1893d8c91f91d63f03c9f4b3d9a20cd24c377f5697f2fe24028f10949550af6f2a05d95db6d5e29700dfaa05f1c3d615773 |
| 28 |
AUX lvm2-2.02.108-example.conf.in.patch 1681 SHA256 c9e0b46965f68c25495e21ca9504699031ed88dbb69407a08d53569ddc88ae4c SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c WHIRLPOOL 0fc73d8e6f47596fa1789118aefebf931fb217342259da838d701bdeb96f21d7de59f29ac81c3c0f4a00db711e86b9fac6b4c889cf05ffc90ad8fd5a9ef77cd1 |
| 29 |
AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 SHA256 5cbdb4c4db1a77767a8cf3a89490eb0e21a2d4cc7729a8ffb099e4d0746e2775 SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041 WHIRLPOOL 53e723bdcfe07f668abf6fe9e6093ae38d81b01bd10ade0b40a037d44c367a6945ed86d14d70c2af8af6e7063763fd3620591b5c7384bd255b98cceb7ee192f3 |
| 30 |
@@ -29,9 +29,10 @@ AUX lvm2-fix-stdio-usage.patch 3666 SHA256 79c5379cbf660f8dabd45359463c77a40b5a8 |
| 31 |
AUX lvm2-musl-fixes.patch 1537 SHA256 6516f64faeccaf87641f7c29823344baea0f3af9ac14701e98fa768cbccb703d SHA512 87bd64a0c7525cbf5d49f1fbdd4a86f23bade065362580a1f2ef3b73b5e76e865e620800c922aa6819ace78daf3d4e2ce96b7990c63dcdbf504d03e636d26c00 WHIRLPOOL 9aeabec1f8b0e3487cad583e359c729b5c45ecbc426b48c19260d1f3a8e377fe5e8f09297d893dc2588b9ee11537148558a372c029ac84c02282011cc07440fe |
| 32 |
AUX lvmetad.initd-2.02.105-r2 294 SHA256 6da831ad5d96fabb5cdfdf41e4f3228020764edcad5101b6eeb9a0edaa4af259 SHA512 6a74b5d82aeecfefe2ecf59285da68abe6fb83859bb7097c40795581a2281ca4aa3d563f63ecceb691c4e02d63e5a402f3bec5a206f32d58f92f9fe322d49245 WHIRLPOOL 3eabc58e707662d50469e4a46ba2fea8ba3102857b2ec9c53b213f38bc51d4605b1e9675539299c4ad2db9107b00473c551f3be8e110a3b5ee0a4c5eb33cfa88 |
| 33 |
AUX lvmetad.initd-2.02.116-r3 355 SHA256 a447400a2b08828f5d63e9b4d3ccadd21a1cb3737823f935579376e2add8842c SHA512 d471258df5a4fedd506d3c75e986db4d27787b6e413a58a5d68bd6467f6d5583d79fe12711079e72be81911278ac0dc7f7887d15763e7455f61752687cf22b49 WHIRLPOOL c41abcbed340dfcc71ae110d4af08b6281b2da93babab8c2d1c5e4a9f38276d6cce72dcd15dce02ebb144ab700024af1b60d653df3701a575f7bccb96421e221 |
| 34 |
+AUX lvmlockd.initd-2.02.166-r1 400 SHA256 d87de4c635da9a083db56112c77d78a6d4834874ae87e4944e1e86047fe1e097 SHA512 157d468f05d05c1498ada8f5042280d29618e57f994cfae38ad31cef6936669ef19a18bfb59b6e37ee3217ac35ff3b1f3eb755aba4dd884ad895b9d637617ccd WHIRLPOOL 795a126654b826553075f8b29e23b1e4dd8f26b43392cbceaacf8bfaab8635b0944d3adeb90db2c02f7f26a1106bfe314df879b5c558b341aa406d7d59e379b9 |
| 35 |
DIST LVM2.2.02.116.tgz 1538340 SHA256 2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767 SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d WHIRLPOOL 1e89ec941882fddba62c9649be46eb5bc6c9cb899669d4bbe4a4a1023c8bf7d8264c4815ef88bb39dedcb9637815411feb826aa102e629d77b80e45e099e398d |
| 36 |
DIST LVM2.2.02.166.tgz 2148324 SHA256 e120b066b85b224552efda40204488c5123de068725676fd6e5c8bc655051b94 SHA512 8bebe9b474f791b5edf5366b0bd24861fbbaf8a83afa2a9e2a8e3917e05e4ecbf6877f018be03ffb4e9b4c8832208264165b85182bf79a07661adf35128b4a21 WHIRLPOOL a4c2e0b2e8da85301b2518b35193304436715fdf45cbc7bc28fd6f7b88af15e611134d5a530d2311b23544aa67c3a7f13fd3780d4d46fc10854e624fb8b27870 |
| 37 |
EBUILD lvm2-2.02.116-r4.ebuild 9769 SHA256 805fd9f6b2a50cdee337df0c17841ad8cbfb783ec584f82ae99d18f4d4bd2cda SHA512 ff43be372bcfb7fd7a0cf22c85d2c4aaa790d89be56b9718bad0d635fa37fb29646074832b39a3a9f28e5c3f06c334ff9fa37bd128bfc3f67577234f1763615c WHIRLPOOL b22b87da6833266f929b0972772b573857a92858454974ca588e5cdf6d1e6412b19df49f89b432d022c51f61bf65590ad7802874efcbfd673ac8af78e1aa3f7f |
| 38 |
EBUILD lvm2-2.02.116.ebuild 9403 SHA256 4cd253d414f2f5a43877a46a29060b49370b7de1fb839b829148d41b452a30ea SHA512 b4341ff966c615dda3d3a15e63e227b1dea7942bcbf3d3ab3023461b6c059cf9e2149456052c698a0688314cfdb23eb86bad8c4c4e79cc8ed46f23cc7da371c7 WHIRLPOOL bddad07d3066a6e9c50a9f65b4a660bfb3211269e8dab12213f27811badfc74ec51aed6816c098ab7ef8279ba236d27e31b7b629e9428d505a85b2b0015853ab |
| 39 |
-EBUILD lvm2-2.02.166.ebuild 9726 SHA256 910d4f469a8706cd10c1f8ab49155b871c56c82d84f7c2c0a3bd406a85d8f4b2 SHA512 96914be563cc0fd272f603ce3c4c7d33ad92b6c23a770e09d6717cfa69655fc2b1bc3f139375d253f581d06aa010fe62477a5b208c7956c54aecc1b987c33164 WHIRLPOOL 4d9eb4dd63c9bc9d61423e359d257a1a109428cb5f77135146baf93cd3a8e4eca68757d99b88294d96a51114a2e56d9e6d1208d2980d654d22155cc490b6c757 |
| 40 |
-MISC metadata.xml 1326 SHA256 f7cf280b3f275f568307e2d1f9c4164e41c262d6ce044c01897e577321f86ff5 SHA512 1cb659d57327fda2d14ac27d09801df79d6ef816c0a796711068c7dc4e6c038c023473e9d6f8dc08ef82be589d5641eb513bd5a7cf7e57e9800b73df423d14ba WHIRLPOOL adce1996947e7dca1627bed56bb7bf9716214a11488d2540159b70e74ed286801a63e3176379f7981b01f6c884936f0ac1c56e93ceda117f2526e369bb7440bb |
| 41 |
+EBUILD lvm2-2.02.166-r1.ebuild 9840 SHA256 dcce0c28e5c9a73107f635123a0e328901cc051751558ccd3016d682b8cf759b SHA512 c10225d16094d41d1bbee2ff21a939c82747b46962957faa324833252722dca55de8153838eb14a77c43c7f0af7fe7bae729c4d373bab8ac9250d1ff5fbffd87 WHIRLPOOL c1faadf0ce0d9b500a042d5de4e2943b913b6ae80d53bf5e51285cd68ebf97af6ee6c9745b82e820ae02367e44522741b054b4030057dd3a20cad47d07ce8170 |
| 42 |
+MISC metadata.xml 1397 SHA256 2b717cd8b25dab45bbf8e04e9d1ea312132ab7d969dbaabcf5ce3665da04dab1 SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35 WHIRLPOOL f7d03ebb6752c774d7d0415a0cf1d936e9206e4a923cc9b670d593bbc412baa9a0c96f369fd8be1170642ca8d54ec5165cc1929b88e4267e73ec630ed6b82cde |
| 43 |
|
| 44 |
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 b/sys-fs/lvm2/files/lvm.rc-2.02.166-r1 |
| 45 |
similarity index 96% |
| 46 |
rename from sys-fs/lvm2/files/lvm.rc-2.02.116-r6 |
| 47 |
rename to sys-fs/lvm2/files/lvm.rc-2.02.166-r1 |
| 48 |
index 990fd6c..e779d2f 100644 |
| 49 |
--- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 |
| 50 |
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.166-r1 |
| 51 |
@@ -1,5 +1,5 @@ |
| 52 |
#!/sbin/openrc-run |
| 53 |
-# Copyright 1999-2016 Gentoo Foundation |
| 54 |
+# Copyright 1999-2017 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
# $Id$ |
| 57 |
|
| 58 |
@@ -77,6 +77,8 @@ start() { |
| 59 |
lvm_commands="${lvm_commands}vgscan --mknodes\n" |
| 60 |
# And turn them on! |
| 61 |
lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" |
| 62 |
+ # Start lockd VGs as required |
| 63 |
+ lvm_commands="${lvm_commands}vgchange --lock-start --lock-opt auto\n" |
| 64 |
# Order of this is important, have to work around dash and LVM readline |
| 65 |
printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null |
| 66 |
eend $? "Failed to setup the LVM" |
| 67 |
|
| 68 |
diff --git a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 b/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 |
| 69 |
new file mode 100644 |
| 70 |
index 0000000..bf3292a |
| 71 |
--- /dev/null |
| 72 |
+++ b/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 |
| 73 |
@@ -0,0 +1,18 @@ |
| 74 |
+#!/sbin/openrc-run |
| 75 |
+# Copyright 1999-2017 Gentoo Foundation |
| 76 |
+# Distributed under the terms of the GNU General Public License v2 |
| 77 |
+# $Id$ |
| 78 |
+ |
| 79 |
+pidfile="/run/lvmlockd.pid" |
| 80 |
+command="/sbin/lvmlockd" |
| 81 |
+command_args="${LVMLOCKD_OPTS:--p ${pidfile}} ${LVMLOCKD_TYPE:--g sanlock}" |
| 82 |
+start_stop_daemon_args="--pidfile ${pidfile}" |
| 83 |
+ |
| 84 |
+depend() { |
| 85 |
+ before sanlock |
| 86 |
+} |
| 87 |
+ |
| 88 |
+start_pre() |
| 89 |
+{ |
| 90 |
+ checkpath --directory /run/lvm || return 1 |
| 91 |
+} |
| 92 |
|
| 93 |
diff --git a/sys-fs/lvm2/lvm2-2.02.166.ebuild b/sys-fs/lvm2/lvm2-2.02.166-r1.ebuild |
| 94 |
similarity index 95% |
| 95 |
rename from sys-fs/lvm2/lvm2-2.02.166.ebuild |
| 96 |
rename to sys-fs/lvm2/lvm2-2.02.166-r1.ebuild |
| 97 |
index e83c143..f739153 100644 |
| 98 |
--- a/sys-fs/lvm2/lvm2-2.02.166.ebuild |
| 99 |
+++ b/sys-fs/lvm2/lvm2-2.02.166-r1.ebuild |
| 100 |
@@ -1,4 +1,4 @@ |
| 101 |
-# Copyright 1999-2016 Gentoo Foundation |
| 102 |
+# Copyright 1999-2017 Gentoo Foundation |
| 103 |
# Distributed under the terms of the GNU General Public License v2 |
| 104 |
# $Id$ |
| 105 |
|
| 106 |
@@ -12,9 +12,9 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
| 107 |
|
| 108 |
LICENSE="GPL-2" |
| 109 |
SLOT="0" |
| 110 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 111 |
-IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only" |
| 112 |
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) |
| 113 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 114 |
+IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only" |
| 115 |
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) |
| 116 |
systemd? ( udev ) |
| 117 |
clvm? ( !systemd )" |
| 118 |
|
| 119 |
@@ -27,6 +27,7 @@ DEPEND_COMMON=" |
| 120 |
) |
| 121 |
|
| 122 |
readline? ( sys-libs/readline:0= ) |
| 123 |
+ sanlock? ( sys-cluster/sanlock ) |
| 124 |
systemd? ( >=sys-apps/systemd-205:0= ) |
| 125 |
udev? ( >=virtual/libudev-208:=[static-libs?] )" |
| 126 |
# /run is now required for locking during early boot. /var cannot be assumed to |
| 127 |
@@ -192,6 +193,7 @@ src_configure() { |
| 128 |
[ -z "${clvmd}" ] && clvmd="none" |
| 129 |
myconf+=( --with-clvmd=${clvmd} ) |
| 130 |
myconf+=( --with-pool=${buildmode} ) |
| 131 |
+ |
| 132 |
else |
| 133 |
myconf+=( --with-clvmd=none --with-cluster=none ) |
| 134 |
fi |
| 135 |
@@ -213,6 +215,7 @@ src_configure() { |
| 136 |
$(use_enable udev udev_rules) \ |
| 137 |
$(use_enable udev udev_sync) \ |
| 138 |
$(use_with udev udevdir "$(get_udevdir)"/rules.d) \ |
| 139 |
+ $(use_enable sanlock lockd-sanlock) \ |
| 140 |
$(use_enable systemd udev-systemd-background-jobs) \ |
| 141 |
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
| 142 |
${myconf[@]} \ |
| 143 |
@@ -247,13 +250,17 @@ src_install() { |
| 144 |
|
| 145 |
if use !device-mapper-only ; then |
| 146 |
newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
| 147 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.116-r6 lvm |
| 148 |
+ newinitd "${FILESDIR}"/lvm.rc-2.02.166-r1 lvm |
| 149 |
newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
| 150 |
|
| 151 |
newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
| 152 |
newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
| 153 |
fi |
| 154 |
|
| 155 |
+ if use sanlock; then |
| 156 |
+ newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
| 157 |
+ fi |
| 158 |
+ |
| 159 |
if use clvm; then |
| 160 |
newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd |
| 161 |
newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd |
| 162 |
|
| 163 |
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml |
| 164 |
index 33079b1..cca547c 100644 |
| 165 |
--- a/sys-fs/lvm2/metadata.xml |
| 166 |
+++ b/sys-fs/lvm2/metadata.xml |
| 167 |
@@ -24,6 +24,7 @@ |
| 168 |
<flag name="openais">Openais support for clustered lvm</flag> |
| 169 |
<flag name="thin">Support for thin volumes</flag> |
| 170 |
<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag> |
| 171 |
+ <flag name="sanlock">Enable lvmlockd with support for sanlock</flag> |
| 172 |
</use> |
| 173 |
<upstream> |
| 174 |
<remote-id type="cpe">cpe:/a:heinz_mauelshagen:lvm2</remote-id> |
Archives