[arch-commits] Commit in lvm2/trunk (ChangeLog PKGBUILD device-mapper.rules)

Eric Bélanger eric at archlinux.org
Sat Sep 19 23:32:58 UTC 2009


    Date: Saturday, September 19, 2009 @ 19:32:57
  Author: eric
Revision: 52445

Upstream update, Implemented split packages, PKGBUILD clean up, Renamed pkgconfig file (close FS#15909)

Added:
  lvm2/trunk/device-mapper.rules
Modified:
  lvm2/trunk/ChangeLog
  lvm2/trunk/PKGBUILD

---------------------+
 ChangeLog           |   18 ++++++++++++
 PKGBUILD            |   70 +++++++++++++++++++++++++++++---------------------
 device-mapper.rules |    1 
 3 files changed, 60 insertions(+), 29 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-09-19 17:54:23 UTC (rev 52444)
+++ ChangeLog	2009-09-19 23:32:57 UTC (rev 52445)
@@ -1,27 +1,45 @@
+2009-09-18  Eric Belanger  <eric at archlinux.org>
+
+	* lvm2 2.02.52-1
+	* device-mapper 1.02.37-1
+	* Upstream update
+	* Implemented split packages
+	* PKGBUILD clean up
+	* Renamed pkgconfig file (close FS#15909)
+
 2009-07-09  Eric Belanger  <eric at archlinux.org>
 
 	* lvm2 2.02.48-1
+	* device-mapper 1.02.33-1
 	* Upstream update
+	* Removed unneeded readline depends (close FS#15205)
 
 2009-05-24  Eric Belanger  <eric at archlinux.org>
 
 	* lvm2 2.02.47-1
+	* device-mapper 1.02.32-1
 	* Upstream update
+	* Added dmsetup.static
 
 2009-03-07  Eric Belanger  <eric at archlinux.org>
 
 	* lvm2 2.02.45-1
+	* device-mapper 1.02.31-1
 	* Upstream update
 
 2009-01-31  Eric Belanger  <eric at archlinux.org>
 
 	* lvm2 2.02.44-1
+	* device-mapper 1.02.30-1
 	* Upstream update
 	* Added bash depends
+	* Added readline depends
+        * Added pkgconfig file
 
 2008-11-11  Eric Belanger  <eric at archlinux.org>
 
 	* lvm2 2.02.43-1
+	* device-mapper 1.02.29-1
 	* Upstream update
 	* Disabled SMP build
 	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-19 17:54:23 UTC (rev 52444)
+++ PKGBUILD	2009-09-19 23:32:57 UTC (rev 52445)
@@ -1,45 +1,57 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
 
-pkgname=lvm2
-pkgver=2.02.48
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.52
+_pkgverdm=1.02.37
+_pkgverlvm=${pkgver}
 pkgrel=1
-pkgdesc="Logical Volume Manager 2 utilities"
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL')
 groups=('base')
-depends=('bash' 'device-mapper>=1.02.33')
-conflicts=('lvm')
-backup=('etc/lvm/lvm.conf')
-options=('!makeflags')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz lvm2_install lvm2_hook)
-md5sums=('0d24c2709f439eeca36261e5cea68330' '40dccdb1044f00fc1e29ca549933d4bd'\
-         'd6f3ca901747c386aa0d842e9ea64413')
-sha1sums=('8a6f29f08f731caffa09f52e5ca41bcce80ff3b9'
-          '86358b3360373dcd1d7e1bf009fe6e6d0c70cdc3'
-          '0c2a367f2217e6363e5e80257cbc7730d3841e42')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install lvm2_hook device-mapper.rules)
+md5sums=('f3b3aed6f6aacd8f351d9a5da097293f' '40dccdb1044f00fc1e29ca549933d4bd'\
+         'd6f3ca901747c386aa0d842e9ea64413' '065f32a36947e6183722ed9aef13dc0c')
+sha1sums=('a3ff11cac451104acb5052f8d88c7d6bdbfae96e' '86358b3360373dcd1d7e1bf009fe6e6d0c70cdc3'\
+         '0c2a367f2217e6363e5e80257cbc7730d3841e42' '003f5cf654503dcc9c1ba7c11c7d6e77bf27bb8d')
 
 build() {
-  cd "${srcdir}/LVM2.${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-readline \
+    --enable-pkgconfig --enable-static_link --with-staticdir=/sbin  || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" sbindir="${pkgdir}/sbin" install || return 1
+}
+
+package_device-mapper() {
+  pkgver=${_pkgverdm}
+  pkgdesc="Device mapper userspace library and tools"
+  url="http://sourceware.org/dm/"
+  depends=('glibc' 'readline')
+
+  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  make DESTDIR="${pkgdir}" sbindir="${pkgdir}/sbin" \
+    libdir="${pkgdir}/lib" install_device-mapper || return 1
+  # install the static library in /usr/lib
+  rm "${pkgdir}"/lib/libdevmapper.a*
+  install -D -m644 libdm/ioctl/libdevmapper.a "${pkgdir}/usr/lib/libdevmapper.a" || return 1
+  # install udev rule
+  install -D -m644 "${srcdir}/device-mapper.rules" "${pkgdir}/etc/udev/rules.d/device-mapper.rules" || return 1
+  # fix device-mapper link bug
+  ln -sf /lib/libdevmapper.so "${pkgdir}/usr/lib/libdevmapper.so" || return 1
+}
+
+package_lvm2() {
+  pkgdesc="Logical Volume Manager 2 utilities"
+  depends=('bash' "device-mapper>=${_pkgverdm}")
+  conflicts=('lvm')
+  backup=('etc/lvm/lvm.conf')
+  options=('!makeflags')
+
+  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  make DESTDIR="${pkgdir}" sbindir="${pkgdir}/sbin" install_lvm2 || return 1
   install -d "${pkgdir}"/etc/lvm/{archive,backup} || return 1
-  # a static binary is required for Arch's initrd
-  ./configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var \
-    --enable-static_link || return 1
-  make || return 1
-  install -D -m755 tools/lvm.static "${pkgdir}/sbin/lvm.static" || return 1
   # add hook
   install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" || return 1
   install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" || return 1
-
-  # remove files provided by device-mapper package
-  rm "${pkgdir}/usr/include/libdevmapper.h"
-  rmdir "${pkgdir}/usr/include"
-  rm "${pkgdir}"/usr/lib/libdevmapper.*
-  rmdir "${pkgdir}/usr/lib"
-  rm "${pkgdir}/sbin/dmsetup"
-  rm "${pkgdir}/usr/share/man/man8/dmsetup.8"
 }

Added: device-mapper.rules
===================================================================
--- device-mapper.rules	                        (rev 0)
+++ device-mapper.rules	2009-09-19 23:32:57 UTC (rev 52445)
@@ -0,0 +1 @@
+ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", NAME="mapper/%c", MODE="0600", SYMLINK+="disk/by-name/%c"




More information about the arch-commits mailing list