1 |
commit: 8c46425bad03e4a1be1259362632889c66776806 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 13 18:54:33 2016 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 13 19:01:53 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c46425b |
7 |
|
8 |
sys-cluster/drbd: bug #548800, support IPv6 addresses in init. |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
sys-cluster/drbd/drbd-8.4.3-r1.ebuild | 81 +++++++++++++++++++++++++++++++++++ |
13 |
sys-cluster/drbd/files/drbd-8.0.rc | 2 +- |
14 |
2 files changed, 82 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/sys-cluster/drbd/drbd-8.4.3-r1.ebuild b/sys-cluster/drbd/drbd-8.4.3-r1.ebuild |
17 |
new file mode 100644 |
18 |
index 0000000..f80504c |
19 |
--- /dev/null |
20 |
+++ b/sys-cluster/drbd/drbd-8.4.3-r1.ebuild |
21 |
@@ -0,0 +1,81 @@ |
22 |
+# Copyright 1999-2014 Gentoo Foundation |
23 |
+# Distributed under the terms of the GNU General Public License v2 |
24 |
+# $Id$ |
25 |
+ |
26 |
+EAPI=4 |
27 |
+ |
28 |
+inherit bash-completion-r1 eutils multilib versionator udev |
29 |
+ |
30 |
+LICENSE="GPL-2" |
31 |
+ |
32 |
+DESCRIPTION="mirror/replicate block-devices across a network-connection" |
33 |
+SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz" |
34 |
+HOMEPAGE="http://www.drbd.org" |
35 |
+ |
36 |
+KEYWORDS="~amd64 ~x86" |
37 |
+IUSE="heartbeat pacemaker +udev xen" |
38 |
+SLOT="0" |
39 |
+ |
40 |
+src_prepare() { |
41 |
+ # respect LDFLAGS, #453442 |
42 |
+ sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \ |
43 |
+ -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \ |
44 |
+ -i user{,/legacy}/Makefile.in || die |
45 |
+ # respect multilib |
46 |
+ sed -i -e "s:/lib/:/$(get_libdir)/:g" \ |
47 |
+ Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die |
48 |
+ sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ |
49 |
+ -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ |
50 |
+ -i user/{,legacy/}Makefile.in || die |
51 |
+ # correct install paths (really correct this time) |
52 |
+ sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \ |
53 |
+ scripts/Makefile.in || die |
54 |
+ # don't participate in user survey bug 360483 |
55 |
+ sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die |
56 |
+ sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die |
57 |
+} |
58 |
+ |
59 |
+src_configure() { |
60 |
+ econf \ |
61 |
+ --localstatedir=/var \ |
62 |
+ --with-utils \ |
63 |
+ --without-km \ |
64 |
+ --without-rgmanager \ |
65 |
+ $(use_with udev) \ |
66 |
+ $(use_with xen) \ |
67 |
+ $(use_with pacemaker) \ |
68 |
+ $(use_with heartbeat) \ |
69 |
+ --with-bashcompletion \ |
70 |
+ --with-distro=gentoo |
71 |
+} |
72 |
+ |
73 |
+src_compile() { |
74 |
+ # only compile the tools |
75 |
+ emake OPTFLAGS="${CFLAGS}" tools |
76 |
+} |
77 |
+ |
78 |
+src_install() { |
79 |
+ # only install the tools |
80 |
+ emake DESTDIR="${D}" install-tools |
81 |
+ dodoc README ChangeLog |
82 |
+ |
83 |
+ # install our own init script |
84 |
+ newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} |
85 |
+ |
86 |
+ dodoc scripts/drbd.conf.example |
87 |
+} |
88 |
+ |
89 |
+pkg_postinst() { |
90 |
+ einfo |
91 |
+ einfo "Please copy and gunzip the configuration file:" |
92 |
+ einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf" |
93 |
+ einfo "and edit it to your needs. Helpful commands:" |
94 |
+ einfo "man 5 drbd.conf" |
95 |
+ einfo "man 8 drbdsetup" |
96 |
+ einfo "man 8 drbdadm" |
97 |
+ einfo "man 8 drbddisk" |
98 |
+ einfo "man 8 drbdmeta" |
99 |
+ einfo |
100 |
+ |
101 |
+ elog "Remember to enable drbd support in kernel." |
102 |
+} |
103 |
|
104 |
diff --git a/sys-cluster/drbd/files/drbd-8.0.rc b/sys-cluster/drbd/files/drbd-8.0.rc |
105 |
index 4adbb82..636a6b5 100644 |
106 |
--- a/sys-cluster/drbd/files/drbd-8.0.rc |
107 |
+++ b/sys-cluster/drbd/files/drbd-8.0.rc |
108 |
@@ -63,7 +63,7 @@ adjust_with_progress() { |
109 |
else echo echo -n ".. "; |
110 |
fi |
111 |
IFS=$IFS_O |
112 |
- $CMD || { |
113 |
+ eval $CMD || { |
114 |
echo |
115 |
eend 20 "cmd $CMD failed!" |
116 |
return 20 |