From 2ca66d70b57893105b8ee762f74df6d3fbb8706a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 18 Oct 2009 07:55:30 +0200
Subject: [PATCH] lvm2: build lvm and dmsetup as static, use them for the
 initramfs.

Bump revision for both packages.

--HG--
extra : convert_revision : 2f321102058adab653a9f224dca256009143af06
---
 templates/lvm2/device-mapper.template    | 1 +
 templates/lvm2/files/lvm2.initramfs-hook | 6 +++---
 templates/lvm2/template                  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/lvm2/device-mapper.template b/templates/lvm2/device-mapper.template
index 45fd7b51659..3ea3e92089b 100644
--- a/templates/lvm2/device-mapper.template
+++ b/templates/lvm2/device-mapper.template
@@ -4,6 +4,7 @@ long_desc="
  This package contains the supporting userspace utility, dmsetup,
  for the kernel device-mapper and its required library, libdevmapper."
 
+revision=1
 Add_dependency run glibc
 Add_dependency run readline
 
diff --git a/templates/lvm2/files/lvm2.initramfs-hook b/templates/lvm2/files/lvm2.initramfs-hook
index 78947d872e9..d2cf02212e3 100644
--- a/templates/lvm2/files/lvm2.initramfs-hook
+++ b/templates/lvm2/files/lvm2.initramfs-hook
@@ -14,7 +14,7 @@ prereqs)
 	;;
 esac
 
-if [ ! -x /sbin/lvm ]; then
+if [ ! -x /sbin/lvm.static -o ! -x /sbin/dmsetup.static ]; then
 	exit 0
 fi
 
@@ -25,8 +25,8 @@ if [ -e /etc/lvm/lvm.conf ]; then
 	cp /etc/lvm/lvm.conf ${DESTDIR}/etc/lvm/
 fi
 
-copy_exec /sbin/dmsetup
-copy_exec /sbin/lvm
+copy_exec /sbin/dmsetup.static /sbin/dmsetup
+copy_exec /sbin/lvm.static /sbin/lvm
 
 for x in dm_mod dm_snapshot dm_mirror; do
 	manual_add_modules ${x}
diff --git a/templates/lvm2/template b/templates/lvm2/template
index 8bcbb6d8c21..6ded8eba6ff 100644
--- a/templates/lvm2/template
+++ b/templates/lvm2/template
@@ -1,12 +1,12 @@
 # Template file for 'lvm2'
 pkgname=lvm2
 version=2.02.53
-revision=2
+revision=3
 wrksrc=LVM2.${version}
 distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
 build_style=gnu_configure
 configure_args="--disable-selinux --enable-readline --enable-pkgconfig
- --enable-pkgconfig --enable-fsadm"
+ --enable-pkgconfig --enable-fsadm --enable-static_link --with-staticdir=/sbin"
 make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version
  sbindir=$XBPS_DESTDIR/$pkgname-$version/sbin
  libdir=$XBPS_DESTDIR/$pkgname-$version/lib