diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2009-07-22 00:40:49 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-07-22 00:40:49 +0000 |
commit | 7a92ddbb4e4a3fdbef2c3b2e8c77209b1de93f71 (patch) | |
tree | 91a872ea727778a479601374235a9de8a95808da /sys-fs/lvm2 | |
parent | Fixed tests. Closes bug #276299 (diff) | |
download | historical-7a92ddbb4e4a3fdbef2c3b2e8c77209b1de93f71.tar.gz historical-7a92ddbb4e4a3fdbef2c3b2e8c77209b1de93f71.tar.bz2 historical-7a92ddbb4e4a3fdbef2c3b2e8c77209b1de93f71.zip |
Bug #270350: implement pkgconfig for lvm2. Also bump to EAPI=2. Include new spin of as-needed patch, tested by Calchan.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r-- | sys-fs/lvm2/ChangeLog | 10 | ||||
-rw-r--r-- | sys-fs/lvm2/Manifest | 6 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch | 14 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.02.48-fix-pkgconfig.patch | 45 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.02.48-r2.ebuild | 215 |
5 files changed, 280 insertions, 10 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index ee118026a4a0..bb127dabb5e5 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/lvm2 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.162 2009/07/19 18:09:35 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.163 2009/07/22 00:40:49 robbat2 Exp $ + +*lvm2-2.02.48-r2 (22 Jul 2009) + + 22 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> + +lvm2-2.02.48-r2.ebuild, files/lvm2-2.02.48-as-needed.patch, + +files/lvm2-2.02.48-fix-pkgconfig.patch: + Bug #270350: implement pkgconfig for lvm2. Also bump to EAPI=2. Include + new spin of as-needed patch, tested by Calchan. 19 Jul 2009; Christian Ruppert <idl0r@gentoo.org> files/lvm2-2.02.48-as-needed.patch: diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index f47fb5fa6e8c..e2c6658ead12 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -14,8 +14,9 @@ AUX lvm.confd-2.02.28-r2 173 RMD160 cf554372fa11df056e3757e5139fad6c7606a696 SHA AUX lvm.rc-2.02.28-r2 661 RMD160 3b267ab500785de249101548a15792708d3adc55 SHA1 b014a0d4344c58c963db20cefeb726dfd66d1b1a SHA256 962d9e8baa06a617671701d21f8a2849b45ab9baa6684b2e99b2b03192c9e66a AUX lvm2-2.02.45-device-mapper-export-format.patch 10323 RMD160 d36a0d80add1ea812cc7f4828aa4a71b0accff78 SHA1 29e5b230ce7562dee59cd61068a8faa6684518fe SHA256 563103fc0fa4c2a35a9adf94332f0502f36fd85e408916b7be7e3503121cc1d0 AUX lvm2-2.02.45-dmeventd.patch 457 RMD160 280708918c33db4614d825e6c9f1909aa3f52a62 SHA1 3c3e17919d369457947944d428508a94049d3787 SHA256 1b275c4321c20227af6a758f962dfd2f14d2f25a65f9b74e9d43f93d3a6bf37e -AUX lvm2-2.02.48-as-needed.patch 7883 RMD160 d092941032d4f15e54771b728f0027294d8fe5a5 SHA1 b6ab6df5b8001d2cbf29f6c6ad9ea0d5a065249b SHA256 637fc91df2c66fcce5618d7ecdc60e9d4efd9074dc4fef265ef063d1861d1939 +AUX lvm2-2.02.48-as-needed.patch 7894 RMD160 d44bc76d5f83249af6401c81d7a21082022446c8 SHA1 07b850f41425cd1505259d54de3daf9cdb3cf259 SHA256 8e23f75f9e51f1c94bcba4a4a87534146baa6e992f38f86552e8688091cfbc09 AUX lvm2-2.02.48-device-mapper-export-format.patch 11244 RMD160 1ba7988ef2782b4565d66fb6e9800bc698042c22 SHA1 82548e5b97c3239f121ec5e542303f1acb269eac SHA256 3a0e1d6d4fa43bd4549c75b562f636c78e39fbba1aa8b127ca179e223a60c50e +AUX lvm2-2.02.48-fix-pkgconfig.patch 1397 RMD160 1b877f041eebcf9af9a4ba15c0d823056c629dec SHA1 18a9ae390e0363a67463fb8b72dca0a100d5ca33 SHA256 ea505d8f3b0031336c8d5059ceaab62dae434b5ab663aa45c07532df4df7ef6f AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460 AUX lvm2-stop.sh 1939 RMD160 52d1adbf4bdbe6e75e9ff2e91c809b6eed5839d5 SHA1 8ccf316b02fb5f79bb6c0464cc3c1606704cec7b SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c @@ -40,6 +41,7 @@ EBUILD lvm2-2.02.45-r1.ebuild 5709 RMD160 71ba82e6d66707387468e9c211e5fd7f8d7f2b EBUILD lvm2-2.02.45-r2.ebuild 5850 RMD160 1012c49af0b8e7be8c0b3f21af05a88f7ce06bf0 SHA1 94cfd0ac9fd133f1b7b4bee61da153db551d5e22 SHA256 dad745a2982412b830454f6b2a3681c0002660a03400218e75f6b65565f3f40d EBUILD lvm2-2.02.45.ebuild 5742 RMD160 cc779cd4a0e5fd91bde37c947ca86a1e8ffae918 SHA1 e82a11a090203d711e8fe44e33df16aaa568f457 SHA256 1183473aa11fccc6712c6922bccc65b586830363464d648414f273f18387319e EBUILD lvm2-2.02.48-r1.ebuild 6176 RMD160 8d4e11a7ac4db9da2ccd784c40c9eef29f858204 SHA1 3b3dad64f605c59a91088981e45e8e28103d5e35 SHA256 fa5e0baf9fa0528db9bf441584c97c8cb7a415b33c468fc1334b240e063e0bd6 +EBUILD lvm2-2.02.48-r2.ebuild 6313 RMD160 7bf787b7b999d235d64d5e1554eaf57b8d2f2c31 SHA1 6b588f811efc4cec41179ed9e5e4bb6b42432e36 SHA256 c79c087ea3aa71b10f532cbc4f9834832246dd50bd394aa9bb19a665dadebac6 EBUILD lvm2-2.02.48.ebuild 6021 RMD160 f546097fc281d6b3603363d4b0c9122e503e21f1 SHA1 1eba319852493f87c640833a32d22e0db56c8cc1 SHA256 5be52df2c337335138d50a0c086d52ea7649da3d971e230b5bcd6fd93fc3f886 -MISC ChangeLog 26308 RMD160 53dd2939264b07caf3a53144822fd338485f16b8 SHA1 cffcc31f20bfdec728fb1a5abc9b02071d933e2e SHA256 adddbd718acb1165c40506143bbc3ffd321c2c86f392437d0362ee131d535dd0 +MISC ChangeLog 26626 RMD160 495a3755a6395feae9eb73500b068fb099eb1d67 SHA1 66c33b194dba3bcbff0a5b2c955ec49bfb7724c3 SHA256 7802a3aab66c4440b61d7199c2168b8a9fea2960f4346ea42e0555536852d737 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f diff --git a/sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch b/sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch index 1f241e5f386e..2089beb72da8 100644 --- a/sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch +++ b/sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch @@ -145,9 +145,9 @@ diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/test/api/Make + $(CC) $(CFLAGS) $(LDFLAGS) -o test $(OBJECTS) $(LVMLIBS) $(LIBS) diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/tools/Makefile.in LVM2.2.02.48/tools/Makefile.in ---- LVM2.2.02.48.orig/tools/Makefile.in 2009-05-21 04:11:29.000000000 -0700 -+++ LVM2.2.02.48/tools/Makefile.in 2009-07-05 14:38:36.536891908 -0700 -@@ -106,24 +106,30 @@ include $(top_srcdir)/make.tmpl +--- LVM2.2.02.48.orig/tools/Makefile.in 2009-07-17 11:16:40.579301663 +0200 ++++ LVM2.2.02.48/tools/Makefile.in 2009-07-21 19:27:05.526972872 +0200 +@@ -106,24 +106,29 @@ include $(top_srcdir)/make.tmpl device-mapper: $(TARGETS_DM) dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX) @@ -156,16 +156,16 @@ diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/tools/Makefil + $(CC) $(CFLAGS) $(LDFLAGS) \ + -L$(top_srcdir)/libdm \ + -o $@ dmsetup.o \ -+ -ldevmapper $(LIBS) ++ -ldevmapper $(LIB_PTHREAD) dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a - $(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \ - -L$(interfacedir) -ldevmapper $(LIBS) \ +- $(LIB_PTHREAD) + $(CC) $(CFLAGS) $(LDFLAGS) -static \ + -L$(interfacedir) \ + -o $@ dmsetup.o \ -+ -ldevmapper $(LIBS) \ - $(LIB_PTHREAD) ++ -ldevmapper $(LIB_PTHREAD) all: device-mapper @@ -185,4 +185,4 @@ diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/tools/Makefil + $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic liblvm2cmd.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o - cat $(top_srcdir)/lib/liblvm-internal.a > $@ + cat $(top_srcdir)/lib/liblvm-internal.a > $@
\ No newline at end of file diff --git a/sys-fs/lvm2/files/lvm2-2.02.48-fix-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.48-fix-pkgconfig.patch new file mode 100644 index 000000000000..10d923b835b9 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.02.48-fix-pkgconfig.patch @@ -0,0 +1,45 @@ +libdevmapper.so doesn't link to SELinux libraries unless SELinux is enabled. +Adding those libraries to Libs.private unconditionally is wrong. + +See bug 270350 +--- +--- LVM2.2.02.48/configure.in ++++ LVM2.2.02.48/configure.in +@@ -558,18 +558,19 @@ + if test x$HAVE_SEPOL = xyes; then + AC_DEFINE([HAVE_SEPOL], 1, + [Define to 1 if sepol_check_context is available.]) +- LIBS="-lsepol $LIBS" ++ SELINUX_LIBS="-lsepol $SELINUX_LIBS" + fi + + AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no) + + if test x$HAVE_SELINUX = xyes; then + AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) +- LIBS="-lselinux $LIBS" ++ SELINUX_LIBS="-lselinux $SELINUX_LIBS" + else + AC_MSG_WARN(Disabling selinux) + fi + ++ LIBS="$SELINUX_LIBS $LIBS" + # With --enable-static_link and selinux enabled, linking + # fails on at least Debian unstable due to unsatisfied references + # to pthread_mutex_lock and _unlock. See if we need -lpthread. +@@ -813,6 +814,7 @@ + AC_SUBST(POOL) + AC_SUBST(QUORUM_CFLAGS) + AC_SUBST(QUORUM_LIBS) ++AC_SUBST(SELINUX_LIBS) + AC_SUBST(SNAPSHOTS) + AC_SUBST(STATICDIR) + AC_SUBST(STATIC_LINK) +--- LVM2.2.02.48/libdm/libdevmapper.pc.in ++++ LVM2.2.02.48/libdm/libdevmapper.pc.in +@@ -8,4 +8,4 @@ + Version: @DM_LIB_PATCHLEVEL@ + Cflags: -I${includedir} + Libs: -L${libdir} -ldevmapper +-Libs.private: -lselinux -lsepol ++Libs.private: @SELINUX_LIBS@ diff --git a/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild new file mode 100644 index 000000000000..e95641f5aace --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild,v 1.1 2009/07/22 00:40:49 robbat2 Exp $ + +EAPI=2 +inherit eutils multilib toolchain-funcs autotools + +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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="readline static clvm cman lvm1 selinux" + +DEPEND="!sys-fs/device-mapper + clvm? ( =sys-cluster/dlm-2* + cman? ( =sys-cluster/cman-2* ) )" + +RDEPEND="${DEPEND} + !sys-fs/lvm-user + !sys-fs/clvm" + +S="${WORKDIR}/${PN/lvm/LVM}.${PV}" + +pkg_setup() { + # 1. Genkernel no longer copies /sbin/lvm blindly. + # 2. There are no longer any linking deps in /usr. + 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 the filename!" + fi +} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.02.45-dmeventd.patch + epatch "${FILESDIR}"/lvm.conf-2.02.45.patch + epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch + epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch + epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch + eautoreconf +} + +src_configure() { + local myconf + local buildmode + + myconf="${myconf} --enable-dmeventd" + myconf="${myconf} --enable-cmdlib" + myconf="${myconf} --enable-applib" + myconf="${myconf} --enable-fsadm" + + # 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 + einfo "Building static LVM, for usage inside genkernel" + buildmode="internal" + # This only causes the .static versions to become available + # For recent systems, there are no linkages against anything in /usr anyway. + # We explicitly provide the .static versions so that they can be included in + # initramfs environments. + myconf="${myconf} --enable-static_link" + else + ewarn "Building shared LVM, it will not work inside genkernel!" + buildmode="shared" + fi + + # dmeventd requires mirrors to be internal, and snapshot available + # so we cannot disable them + myconf="${myconf} --with-mirrors=internal" + myconf="${myconf} --with-snapshots=internal" + + 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} --sbindir=/sbin --with-staticdir=/sbin" + econf $(use_enable readline) \ + $(use_enable selinux) \ + --enable-pkgconfig \ + --libdir=/usr/$(get_libdir) \ + ${myconf} \ + CLDFLAGS="${LDFLAGS}" || die +} + +src_compile() { + einfo "Doing symlinks" + pushd include + emake || die "Failed to prepare symlinks" + popd + + einfo "Doing device-mapper" + pushd libdm + emake || die "failed to build libdm" + #emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a" + popd + + einfo "Doing lib" + pushd lib + emake || die "failed to build lib" + popd + + einfo "Doing main build" + emake || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install + + dodir /$(get_libdir) + # Put these in root so we can reach before /usr is up + for i in \ + libdevmapper-event{,-lvm2{mirror,snapshot}} \ + libdevmapper \ + liblvm2{format1,snapshot,cmd} \ + ; do + b="${D}"/usr/$(get_libdir)/${i} + if [ -f "${b}".so ]; then + mv -f "${b}".so* "${D}"/$(get_libdir) || die + gen_usr_ldscript ${i}.so || die + fi + done + + dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt} + insinto /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die + newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die + newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die + newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die + if use clvm; then + newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die + newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die + fi + + # move shared libs to /lib(64) + if use static; then + dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a" + fi + #gen_usr_ldscript libdevmapper.so + + insinto /etc + doins "${FILESDIR}"/dmtab + insinto /$(get_libdir)/rcscripts/addons + doins "${FILESDIR}"/dm-start.sh + + # Device mapper stuff + newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die + newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die + + newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die + if use static; then + dolib.a daemons/dmeventd/libdevmapper-event.a \ + || die "dolib.a libdevmapper-event.a" + fi + #gen_usr_ldscript libdevmapper-event.so + + insinto /etc/udev/rules.d/ + newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || die + + elog "USE flag nocman is deprecated and replaced" + elog "with the cman USE flag." + elog "" + elog "USE flags clvm and cman are masked" + elog "by default and need to be unmasked to use them" + elog "" + elog "Rebuild your genkernel initramfs if you are using lvm" +} + +pkg_postinst() { + elog "lvm volumes are no longer automatically created for" + elog "baselayout-2 users. If you are using baselayout-2, be sure to" + elog "run: # rc-update add lvm boot" + elog "Do NOT add it if you are using baselayout-1 still." +} + +src_test() { + einfo "Testcases disabled because of device-node mucking" + einfo "If you want them, compile the package and see ${S}/tests" +} |