[arch-commits] Commit in lvm2/repos (9 files)

Eric Bélanger eric at archlinux.org
Thu Apr 26 18:51:17 EDT 2012


    Date: Thursday, April 26, 2012 @ 18:51:17
  Author: eric
Revision: 157317

db-move: moved lvm2 from [testing] to [core] (i686)

Added:
  lvm2/repos/core-i686/11-dm-initramfs.rules
    (from rev 157316, lvm2/repos/testing-i686/11-dm-initramfs.rules)
  lvm2/repos/core-i686/PKGBUILD
    (from rev 157316, lvm2/repos/testing-i686/PKGBUILD)
  lvm2/repos/core-i686/lvm2_hook
    (from rev 157316, lvm2/repos/testing-i686/lvm2_hook)
  lvm2/repos/core-i686/lvm2_install
    (from rev 157316, lvm2/repos/testing-i686/lvm2_install)
Deleted:
  lvm2/repos/core-i686/11-dm-initramfs.rules
  lvm2/repos/core-i686/PKGBUILD
  lvm2/repos/core-i686/lvm2_hook
  lvm2/repos/core-i686/lvm2_install
  lvm2/repos/testing-i686/

-----------------------+
 11-dm-initramfs.rules |    6 +-
 PKGBUILD              |  120 +++++++++++++++++++++++-------------------------
 lvm2_hook             |   50 ++++++++++----------
 lvm2_install          |   58 +++++++++++------------
 4 files changed, 116 insertions(+), 118 deletions(-)

Deleted: core-i686/11-dm-initramfs.rules
===================================================================
--- core-i686/11-dm-initramfs.rules	2012-04-26 21:35:15 UTC (rev 157316)
+++ core-i686/11-dm-initramfs.rules	2012-04-26 22:51:17 UTC (rev 157317)
@@ -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-i686/11-dm-initramfs.rules (from rev 157316, lvm2/repos/testing-i686/11-dm-initramfs.rules)
===================================================================
--- core-i686/11-dm-initramfs.rules	                        (rev 0)
+++ core-i686/11-dm-initramfs.rules	2012-04-26 22:51:17 UTC (rev 157317)
@@ -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-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2012-04-26 21:35:15 UTC (rev 157316)
+++ core-i686/PKGBUILD	2012-04-26 22:51:17 UTC (rev 157317)
@@ -1,61 +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.95
-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{,.asc}
-        lvm2_install
-        lvm2_hook
-        11-dm-initramfs.rules)
-sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
-          '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
-          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
-          '7d63aa838703c9f986531a78164b556f765f5cce'
-          '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"
-}

Copied: lvm2/repos/core-i686/PKGBUILD (from rev 157316, lvm2/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2012-04-26 22:51:17 UTC (rev 157317)
@@ -0,0 +1,59 @@
+# $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.95
+pkgrel=2
+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{,.asc}
+        lvm2_install
+        lvm2_hook
+        11-dm-initramfs.rules)
+sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
+          '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
+          '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601'
+          '7d63aa838703c9f986531a78164b556f765f5cce'
+          'f6a554eea9557c3c236df2943bb6e7e723945c41')
+
+build() {
+  cd "${srcdir}/LVM2.${pkgver}"
+  unset LDFLAGS
+  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \
+    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+    --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}/usr/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}/usr/lib/initcpio/hooks/lvm2"
+  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
+}

Deleted: core-i686/lvm2_hook
===================================================================
--- core-i686/lvm2_hook	2012-04-26 21:35:15 UTC (rev 157316)
+++ core-i686/lvm2_hook	2012-04-26 22:51:17 UTC (rev 157317)
@@ -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
-            local major minor
-            IFS=: read major minor < /sys/class/misc/device-mapper/dev
-            mkdir /dev/mapper
-            mknod "/dev/mapper/control" c ${major} ${minor}
-        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)
-        for pvdev in ${lvmwait//,/ }; do
-            poll_device ${pvdev} ${rootdelay}
-        done
-
-        [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
-
-        msg "Activating logical volumes..."
-        [ -d /etc/lvm ] && /sbin/lvm vgscan
-        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
-    fi
-}

Copied: lvm2/repos/core-i686/lvm2_hook (from rev 157316, lvm2/repos/testing-i686/lvm2_hook)
===================================================================
--- core-i686/lvm2_hook	                        (rev 0)
+++ core-i686/lvm2_hook	2012-04-26 22:51:17 UTC (rev 157317)
@@ -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
+            local major minor
+            IFS=: read major minor < /sys/class/misc/device-mapper/dev
+            mkdir /dev/mapper
+            mknod "/dev/mapper/control" c ${major} ${minor}
+        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)
+        for pvdev in ${lvmwait//,/ }; do
+            poll_device ${pvdev} ${rootdelay}
+        done
+
+        [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
+
+        msg "Activating logical volumes..."
+        [ -d /etc/lvm ] && /sbin/lvm vgscan
+        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
+    fi
+}

Deleted: core-i686/lvm2_install
===================================================================
--- core-i686/lvm2_install	2012-04-26 21:35:15 UTC (rev 157316)
+++ core-i686/lvm2_install	2012-04-26 22:51:17 UTC (rev 157317)
@@ -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-i686/lvm2_install (from rev 157316, lvm2/repos/testing-i686/lvm2_install)
===================================================================
--- core-i686/lvm2_install	                        (rev 0)
+++ core-i686/lvm2_install	2012-04-26 22:51:17 UTC (rev 157317)
@@ -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 "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/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