diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2009-07-28 20:27:57 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-07-28 20:27:57 +0000 |
commit | 84246430eae82a9f342c90234ba6b570be20dff8 (patch) | |
tree | b36277412b1bd2d431f1ea67c9ee85214517362f /sys-fs | |
parent | Remove dep from dev-haskell/haddock, dev-haskell/filepath. (diff) | |
download | historical-84246430eae82a9f342c90234ba6b570be20dff8.tar.gz historical-84246430eae82a9f342c90234ba6b570be20dff8.tar.bz2 historical-84246430eae82a9f342c90234ba6b570be20dff8.zip |
Bug #278304: Update removal of vol_id, replaced by blkid -o udev.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/lvm2/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/lvm2/Manifest | 4 | ||||
-rw-r--r-- | sys-fs/lvm2/files/64-device-mapper.rules-1.02.49-r2 | 26 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.02.49-r2.ebuild | 217 |
4 files changed, 253 insertions, 2 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index 64e005fb72b2..2297fcfa4ad7 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,12 @@ # 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.165 2009/07/24 23:37:37 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.166 2009/07/28 20:27:57 robbat2 Exp $ + +*lvm2-2.02.49-r2 (28 Jul 2009) + + 28 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> + +files/64-device-mapper.rules-1.02.49-r2, +lvm2-2.02.49-r2.ebuild: + Bug #278304: Update removal of vol_id, replaced by blkid -o udev. *lvm2-2.02.49-r1 (24 Jul 2009) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index fa0e040d081e..4f903420b934 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,5 +1,6 @@ AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191 AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd +AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8eb10ee384cf SHA1 c6c6fa203982fcfaf11b4c9e4e79c5dd19dda6c3 SHA256 8fb11cac5757f16f67a62e3ee6ec7d986ee77fa020da7589142ac7efd6d24ac2 AUX clvmd.confd-2.02.39 213 RMD160 d23f8acd6a844e05a3e0da83939513ef0dfab0d8 SHA1 546bfd48a7cfd7e7ffff07861f90e2b8ee29d436 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a AUX clvmd.rc-2.02.28-r3 3367 RMD160 eb09f9ef6d9402c9a22ab145ebb64db5f279adc7 SHA1 f15770f0919402f2fbbc7d8441ef3239e6178d0b SHA256 14c1c738b26869877a2bc74f0f8dd0ae4a764976823443db6f5575556285b519 AUX clvmd.rc-2.02.39 3678 RMD160 50b5ffbf50486a4ca5640344f72e8814c47878db SHA1 7e9e933212e716869e4ba58880bdc526f577cd9b SHA256 9e5ee139b04fd7a691759b84e4d2986752259a4670f1c2f16acb013bf5713b44 @@ -48,6 +49,7 @@ EBUILD lvm2-2.02.48-r1.ebuild 6176 RMD160 8d4e11a7ac4db9da2ccd784c40c9eef29f8582 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 EBUILD lvm2-2.02.49-r1.ebuild 6375 RMD160 3bfdf74e2fe030bd68e30bc5a2b741abba52d5bd SHA1 4e174f18180b40f9eec18ec6a4c55885ee266afa SHA256 4192c95ef181f94995d070f46846b254e6f2fe2d46e0b4e8160d5270a0e33b2f +EBUILD lvm2-2.02.49-r2.ebuild 6403 RMD160 6f2a243d13bfc7a3c7bf3e165443b1d2bd3010ab SHA1 a87a34515d1e9157e302140959e9b41a3bec57f7 SHA256 0d4ddc01ae4ed2fe8dfe1f38bf1ba62405ece08cf624d46eddef906a169cdee8 EBUILD lvm2-2.02.49.ebuild 6310 RMD160 6e4ba8c46f40251bd41d59883fa3015021143ee1 SHA1 06e747a7bdba6025ac02afa58df2db2ce551f9eb SHA256 02a42e1b47248198e614475acbd66ae31c023ae0d4c104e189331a73c8c57cef -MISC ChangeLog 27169 RMD160 3b285298a0dc6f4a8fdc8266804eaac87b0ad47b SHA1 902a05fe79988b827a59a9f7ca09cff9913325a3 SHA256 7119c9131405a999fad125d52d04f9df09085bdcbdc46e002fed255bab6a09c9 +MISC ChangeLog 27392 RMD160 934d5146e8a0066143621cd92b33c83a0e70345d SHA1 32653ae05b74e58d6fed7de55057727fe94771f6 SHA256 77b983a4de69a0e750814ae37015b0471e2c792a50c5bae1d2d5667bae817300 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f diff --git a/sys-fs/lvm2/files/64-device-mapper.rules-1.02.49-r2 b/sys-fs/lvm2/files/64-device-mapper.rules-1.02.49-r2 new file mode 100644 index 000000000000..b6b2c889aef1 --- /dev/null +++ b/sys-fs/lvm2/files/64-device-mapper.rules-1.02.49-r2 @@ -0,0 +1,26 @@ +# do not edit this file, it will be overwritten on update + +KERNEL=="device-mapper", SYMLINK+="mapper/control" + +KERNEL!="dm-*", GOTO="device_mapper_end" +ACTION!="add|change", GOTO="device_mapper_end" + +IMPORT{program}="/sbin/dmsetup info --export -j%M -m%m" +ENV{DM_NAME}!="?*", GOTO="device_mapper_end" +NAME="mapper/$env{DM_NAME}", SYMLINK+="%k" + +SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace" +ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace" + +ENV{DM_SUSPENDED}=="1", GOTO="device_mapper_end" +ENV{DM_EXISTS}=="0", GOTO="device_mapper_end" +ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end" + +IMPORT{program}="/sbin/blkid -o udev -p $tempnode" +OPTIONS+="link_priority=-100" +OPTIONS+="watch" +ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90" +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" + +LABEL="device_mapper_end" diff --git a/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild new file mode 100644 index 000000000000..aa5dc5d7ab9e --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild @@ -0,0 +1,217 @@ +# 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.49-r2.ebuild,v 1.1 2009/07/28 20:27:57 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 + >=sys-apps/util-linux-2.16" + +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 + epatch "${FILESDIR}"/${PN}-2.02.49-lockdir-override.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.49-r1 lvm-start.sh || die + newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r1 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.49-r2 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" +} |