From c81b3455112a3b09a8341fc8c45a91bd92c15a12 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 6 Jun 2011 14:37:09 +0000 Subject: Mon Jun 6 14:37:05 UTC 2011 --- testing/lvm2/11-dm-initramfs.rules | 3 - ...Be-quiet-on-removing-cache-on-read-only-fs.diff | 17 ----- testing/lvm2/PKGBUILD | 72 ---------------------- testing/lvm2/lvm2_hook | 24 -------- testing/lvm2/lvm2_install | 30 --------- 5 files changed, 146 deletions(-) delete mode 100644 testing/lvm2/11-dm-initramfs.rules delete mode 100644 testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff delete mode 100644 testing/lvm2/PKGBUILD delete mode 100644 testing/lvm2/lvm2_hook delete mode 100644 testing/lvm2/lvm2_install (limited to 'testing/lvm2') diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules deleted file mode 100644 index d2c167324..000000000 --- a/testing/lvm2/11-dm-initramfs.rules +++ /dev/null @@ -1,3 +0,0 @@ -# needed with new udev/mkinitcpio and as implemented in dracut: -# -SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff deleted file mode 100644 index e75499e8e..000000000 --- a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff +++ /dev/null @@ -1,17 +0,0 @@ -Do not issue an error message when unable to remove .cache on read-only fs. -=================================================================== -RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v -retrieving revision 1.49 -retrieving revision 1.50 -diff -u -r1.49 -r1.50 ---- LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49 -+++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50 -@@ -108,7 +108,7 @@ - log_very_verbose("Obtaining device list from " - "udev. Removing obolete %s.", - pf->file); -- if (unlink(pf->file) < 0) -+ if (unlink(pf->file) < 0 && errno != EROFS) - log_sys_error("unlink", pf->file); - } - return 1; diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD deleted file mode 100644 index 39e3b4561..000000000 --- a/testing/lvm2/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $ -# Maintainer: Eric Bélanger -# Maintainer: Thomas Bächler - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.85 -_pkgverlvm=${pkgver} -pkgrel=2 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -conflicts=('mkinitcpio<0.5.99') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz - lvm2_install - lvm2_hook - Be-quiet-on-removing-cache-on-read-only-fs.diff - 11-dm-initramfs.rules) -md5sums=('91785ca438e5ce679dd3a386b183d552' - '9fbe01c6e3fca4634b4a38ecdc2f562f' - 'cf05f2c7281e24269ea9dcc6b4e106ba' - '6db89da27928d2415a8e26cd0a842712' - '69e40679cd8b3658bfc619e48baae125') -sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' - '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47' - '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' - '6d7dd04be291d7537235704c816a701fd5beacc0' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') - -build() { - cd "${srcdir}/LVM2.${_pkgverlvm}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh - patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff - unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/LVM2.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_device-mapper - # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.5.99') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - cd liblvm - make DESTDIR="${pkgdir}" install - cd .. - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" -} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook deleted file mode 100644 index 86d2ea582..000000000 --- a/testing/lvm2/lvm2_hook +++ /dev/null @@ -1,24 +0,0 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do - poll_device ${pvdev} ${rootdelay} - done - fi - - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit - eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET - fi -} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install deleted file mode 100644 index 0df69f81b..000000000 --- a/testing/lvm2/lvm2_install +++ /dev/null @@ -1,30 +0,0 @@ -# vim: set ft=sh: - -install () -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" - - add_dir "/dev/mapper" - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" -} - -help () -{ -cat<