[arch-commits] Commit in lvm2/repos (9 files)
Eric Bélanger
eric at archlinux.org
Mon Aug 15 21:08:52 UTC 2011
Date: Monday, August 15, 2011 @ 17:08:52
Author: eric
Revision: 135564
db-move: moved lvm2 from [testing] to [core] (x86_64)
Added:
lvm2/repos/core-x86_64/11-dm-initramfs.rules
(from rev 135562, lvm2/repos/testing-x86_64/11-dm-initramfs.rules)
lvm2/repos/core-x86_64/PKGBUILD
(from rev 135562, lvm2/repos/testing-x86_64/PKGBUILD)
lvm2/repos/core-x86_64/lvm2_hook
(from rev 135562, lvm2/repos/testing-x86_64/lvm2_hook)
lvm2/repos/core-x86_64/lvm2_install
(from rev 135562, lvm2/repos/testing-x86_64/lvm2_install)
Deleted:
lvm2/repos/core-x86_64/11-dm-initramfs.rules
lvm2/repos/core-x86_64/PKGBUILD
lvm2/repos/core-x86_64/lvm2_hook
lvm2/repos/core-x86_64/lvm2_install
lvm2/repos/testing-x86_64/
-----------------------+
11-dm-initramfs.rules | 6 +-
PKGBUILD | 131 +++++++++++++++++++++++-------------------------
lvm2_hook | 50 +++++++++---------
lvm2_install | 58 ++++++++++-----------
4 files changed, 121 insertions(+), 124 deletions(-)
Deleted: core-x86_64/11-dm-initramfs.rules
===================================================================
--- core-x86_64/11-dm-initramfs.rules 2011-08-15 21:08:51 UTC (rev 135563)
+++ core-x86_64/11-dm-initramfs.rules 2011-08-15 21:08:52 UTC (rev 135564)
@@ -1,3 +0,0 @@
-# needed with new udev/mkinitcpio and as implemented in dracut:
-# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
-SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
Copied: lvm2/repos/core-x86_64/11-dm-initramfs.rules (from rev 135562, lvm2/repos/testing-x86_64/11-dm-initramfs.rules)
===================================================================
--- core-x86_64/11-dm-initramfs.rules (rev 0)
+++ core-x86_64/11-dm-initramfs.rules 2011-08-15 21:08:52 UTC (rev 135564)
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2011-08-15 21:08:51 UTC (rev 135563)
+++ core-x86_64/PKGBUILD 2011-08-15 21:08:52 UTC (rev 135564)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.86
-_pkgverlvm=${pkgver}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://sourceware.org/lvm2/"
-license=('GPL2' 'LGPL2.1')
-groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
- lvm2_install
- lvm2_hook
- 11-dm-initramfs.rules)
-md5sums=('3b42dec4d15ad106302a35149082a20e'
- 'dcb82506d732cc7b10159a89b579dba8'
- '8d613b84a175cd85f752a75198e40e15'
- '69e40679cd8b3658bfc619e48baae125')
-sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c'
- '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
- 'a0e0513c2efb183006e57e595d93ce18be297928'
- 'f6a554eea9557c3c236df2943bb6e7e723945c41')
-
-build() {
- cd "${srcdir}/LVM2.${_pkgverlvm}"
- sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
- 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.7')
- 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"
-}
Copied: lvm2/repos/core-x86_64/PKGBUILD (from rev 135562, lvm2/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2011-08-15 21:08:52 UTC (rev 135564)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.87
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz
+ lvm2_install
+ lvm2_hook
+ 11-dm-initramfs.rules)
+md5sums=('4c36c7f216edfe65a6193d2adc389ecd'
+ 'dcb82506d732cc7b10159a89b579dba8'
+ '8d613b84a175cd85f752a75198e40e15'
+ '69e40679cd8b3658bfc619e48baae125')
+sha1sums=('4b217d405133bdc6120568253574a49fae2caa4f'
+ '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+ 'a0e0513c2efb183006e57e595d93ce18be297928'
+ 'f6a554eea9557c3c236df2943bb6e7e723945c41')
+
+build() {
+ cd "${srcdir}/LVM2.${pkgver}"
+ sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
+ 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.${pkgver}"
+ 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.7')
+ backup=('etc/lvm/lvm.conf')
+ options=('!makeflags')
+
+ cd "${srcdir}/LVM2.${pkgver}"
+ make DESTDIR="${pkgdir}" install_lvm2
+ # install applib
+ make -C liblvm DESTDIR="${pkgdir}" install
+ # /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"
+}
Deleted: core-x86_64/lvm2_hook
===================================================================
--- core-x86_64/lvm2_hook 2011-08-15 21:08:51 UTC (rev 135563)
+++ core-x86_64/lvm2_hook 2011-08-15 21:08:52 UTC (rev 135564)
@@ -1,25 +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
- mkdir /dev/mapper
- 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
-}
Copied: lvm2/repos/core-x86_64/lvm2_hook (from rev 135562, lvm2/repos/testing-x86_64/lvm2_hook)
===================================================================
--- core-x86_64/lvm2_hook (rev 0)
+++ core-x86_64/lvm2_hook 2011-08-15 21:08:52 UTC (rev 135564)
@@ -0,0 +1,25 @@
+# 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
+ mkdir /dev/mapper
+ 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
+}
Deleted: core-x86_64/lvm2_install
===================================================================
--- core-x86_64/lvm2_install 2011-08-15 21:08:51 UTC (rev 135563)
+++ core-x86_64/lvm2_install 2011-08-15 21:08:52 UTC (rev 135564)
@@ -1,29 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
- MODULES=" dm-mod dm-snapshot dm-mirror"
- BINARIES=""
- FILES=""
- SCRIPT="lvm2"
-
- 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<<HELPEOF
- This hook loads the necessary modules for an LVM2 root device.
-
- The optional lvmwait= parameter followed by a comma-separated
- list of device names can be given on the command line.
- It will cause the hook to wait until all given devices exist
- before trying to scan and activate any volume groups.
-HELPEOF
-}
Copied: lvm2/repos/core-x86_64/lvm2_install (from rev 135562, lvm2/repos/testing-x86_64/lvm2_install)
===================================================================
--- core-x86_64/lvm2_install (rev 0)
+++ core-x86_64/lvm2_install 2011-08-15 21:08:52 UTC (rev 135564)
@@ -0,0 +1,29 @@
+# vim: set ft=sh:
+
+build()
+{
+ MODULES=" dm-mod dm-snapshot dm-mirror"
+ BINARIES=""
+ FILES=""
+ SCRIPT="lvm2"
+
+ 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<<HELPEOF
+ This hook loads the necessary modules for an LVM2 root device.
+
+ The optional lvmwait= parameter followed by a comma-separated
+ list of device names can be given on the command line.
+ It will cause the hook to wait until all given devices exist
+ before trying to scan and activate any volume groups.
+HELPEOF
+}
More information about the arch-commits
mailing list