Gentoo Archives: gentoo-commits

From: "Christian Zoffoli (xmerlin)" <xmerlin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/clvm: ChangeLog clvm-2.02.39.ebuild clvm-2.02.36.ebuild
Date: Fri, 21 Nov 2008 23:31:46
Message-Id: E1L3fTT-0006Iv-U9@stork.gentoo.org
1 xmerlin 08/11/21 23:31:43
2
3 Modified: ChangeLog
4 Added: clvm-2.02.39.ebuild
5 Removed: clvm-2.02.36.ebuild
6 Log:
7 Version bump, removed a broken version, new init.
8 (Portage version: 2.1.4.4)
9
10 Revision Changes Path
11 1.26 sys-fs/clvm/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/ChangeLog?rev=1.26&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/ChangeLog?rev=1.26&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/ChangeLog?r1=1.25&r2=1.26
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v
20 retrieving revision 1.25
21 retrieving revision 1.26
22 diff -u -r1.25 -r1.26
23 --- ChangeLog 14 Nov 2008 09:10:43 -0000 1.25
24 +++ ChangeLog 21 Nov 2008 23:31:43 -0000 1.26
25 @@ -1,6 +1,17 @@
26 # ChangeLog for sys-fs/clvm
27 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v 1.25 2008/11/14 09:10:43 xmerlin Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/ChangeLog,v 1.26 2008/11/21 23:31:43 xmerlin Exp $
30 +
31 +*clvm-2.02.39 (22 Nov 2008)
32 +
33 + 22 Nov 2008; Christian Zoffoli <xmerlin@g.o>
34 + -files/lvm.confd-2.02.28-r2, -files/lvm.rc-2.02.28-r2,
35 + -files/clvmd.rc-2.02.33-xm, -files/cluster-locking-built-in.patch,
36 + +files/clvmd.confd, files/clvmd.rc, +files/lvm.confd, +files/lvm.rc,
37 + files/lvm2-start.sh, files/lvm2-stop.sh, -files/lvm2-start.sh-2.02.33-xm,
38 + -files/lvm2-stop.sh-2.02.33-xm, -clvm-2.02.36.ebuild,
39 + +clvm-2.02.39.ebuild:
40 + Version bump, removed a broken version, new init.
41
42 *clvm-2.02.36 (14 Nov 2008)
43
44
45
46
47 1.1 sys-fs/clvm/clvm-2.02.39.ebuild
48
49 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/clvm-2.02.39.ebuild?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/clvm-2.02.39.ebuild?rev=1.1&content-type=text/plain
51
52 Index: clvm-2.02.39.ebuild
53 ===================================================================
54 # Copyright 1999-2008 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/clvm-2.02.39.ebuild,v 1.1 2008/11/21 23:31:43 xmerlin Exp $
57
58 inherit eutils multilib
59
60 MY_P="${PN/clvm/LVM2}.${PV}"
61
62 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
63 HOMEPAGE="http://sources.redhat.com/lvm2/"
64 SRC_URI="ftp://sources.redhat.com/pub/lvm2/${MY_P}.tgz"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 KEYWORDS="~amd64 ~x86"
69
70 IUSE="readline static selinux nolvmstatic"
71
72 DEPEND=">=sys-fs/device-mapper-1.02.27
73 =sys-cluster/dlm-2*
74 =sys-cluster/cman-2*
75 "
76
77 RDEPEND="${DEPEND}
78 !sys-fs/lvm-user
79 !sys-fs/lvm2"
80
81 S="${WORKDIR}/${MY_P}"
82
83 src_unpack() {
84 unpack ${A}
85 cd "${S}"
86
87 epatch "${FILESDIR}"/lvm.conf-2.02.33.patch || die
88 #epatch "${FILESDIR}"/cluster-locking-built-in.patch || die
89 }
90
91 src_compile() {
92 # Static compile of lvm2 so that the install described in the handbook works
93 # http://www.gentoo.org/doc/en/lvm2.xml
94 # fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
95 local myconf
96 local buildmode
97
98 # fsadm is broken, don't include it (2.02.28)
99 myconf="${myconf} --enable-dmeventd --enable-cmdlib"
100
101 # Most of this package does weird stuff.
102 # The build options are tristate, and --without is NOT supported
103 # options: 'none', 'internal', 'shared'
104 if use static ; then
105 einfo "Building static LVM, for usage inside genkernel"
106 myconf="${myconf} --enable-static_link"
107 buildmode="internal"
108 else
109 ewarn "Building shared LVM, it will not work inside genkernel!"
110 buildmode="shared"
111 fi
112
113 # dmeventd requires mirrors to be internal, and snapshot available
114 # so we cannot disable them
115 myconf="${myconf} --with-mirrors=internal"
116 myconf="${myconf} --with-snapshots=internal"
117
118 if use lvm1 ; then
119 myconf="${myconf} --with-lvm1=${buildmode}"
120 else
121 myconf="${myconf} --with-lvm1=none"
122 fi
123
124 # disable O_DIRECT support on hppa, breaks pv detection (#99532)
125 use hppa && myconf="${myconf} --disable-o_direct"
126
127 myconf="${myconf} --with-cluster=${buildmode}"
128 # 4-state!
129 myconf="${myconf} --with-clvmd=cman"
130 myconf="${myconf} --with-pool=${buildmode}"
131
132 myconf="${myconf} --sbindir=/sbin --with-staticdir=/sbin"
133 econf $(use_enable readline) \
134 $(use_enable selinux) \
135 --libdir=/usr/$(get_libdir) \
136 ${myconf} \
137 CLDFLAGS="${LDFLAGS}" || die
138 emake || die "compile problem"
139 }
140
141 src_install() {
142 emake DESTDIR="${D}" install
143
144 # TODO: At some point in the future, we need to stop installing the static
145 # as the /sbin/lvm name, and have both variants seperate.
146 if use static; then
147 cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
148 || die "Failed to copy lvm.static"
149 fi
150
151 dodir /$(get_libdir)
152 # Put these in root so we can reach before /usr is up
153 for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
154 b="${D}"/usr/$(get_libdir)/${i}
155 if [ -f "${b}".so ]; then
156 mv -f "${b}".so* "${D}"/$(get_libdir) || die
157 fi
158 done
159
160 dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
161 insinto /lib/rcscripts/addons
162 newins "${FILESDIR}"/lvm2-start.sh lvm-start.sh || die
163 newins "${FILESDIR}"/lvm2-stop.sh lvm-stop.sh || die
164
165 newinitd "${FILESDIR}"/lvm.rc lvm || die
166 newconfd "${FILESDIR}"/lvm.confd lvm || die
167
168 newinitd "${FILESDIR}"/clvmd.rc clvmd || die
169 newconfd "${FILESDIR}"/clvmd.confd clvmd || die
170
171 elog ""
172 elog "Rebuild your genkernel initramfs if you are using lvm"
173 use nolvmstatic && \
174 elog "USE=nolvmstatic has changed to USE=static via package.use"
175 }
176
177 pkg_postinst() {
178 elog "lvm volumes are no longer automatically created for"
179 elog "baselayout-2 users. If you are using baselayout-2, be sure to"
180 elog "run: # rc-update add lvm boot"
181 }